Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

ci: speedup compilation

Browse source
This commit is contained in:
Steffen Vogel 2022-03-14 23:31:57 -04:00
parent 2c1d46d609
commit e19cced20d
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -258,8 +258,8 @@ deploy:docker-dev:
before_script:
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
script:
- docker tag ${DOCKER_IMAGE}/dev:${DOCKER_TAG} ${DOCKER_IMAGE}/dev:latest
- docker push ${DOCKER_IMAGE}/dev:latest
- docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest
- docker push ${DOCKER_IMAGE}:latest
tags:
- docker
needs:

1
cmake/toolchains/debian-arm64.cmake
View file

@ -14,4 +14,3 @@ set(CMAKE_EXE_LINKER_FLAGS " ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot
set(CMAKE_LIBRARY_PATH "/usr/lib/${TRIPLET};/usr/local/lib/${TRIPLET}")
set(GOARCH "arm64")
set(GOARM "8")

5
packaging/docker/Dockerfile.debian-multiarch
View file

@ -25,10 +25,9 @@ ARG DISTRO=debian
ARG DEBIAN_VERSION=bullseye
ARG ARCH=armhf
ARG TRIPLET=arm-linux-gnueabihf
ARG PLATFORM=linux/arm/v7
ARG PREFIX=/app
FROM ${DISTRO}:${DEBIAN_VERSION} AS dev
FROM --platform=${BUILDPLATFORM} ${DISTRO}:${DEBIAN_VERSION} AS dev
ARG DISTRO
ARG ARCH
@ -128,7 +127,7 @@ RUN cmake ${CMAKE_OPTS} .. && \
make -j$(nproc) doc && \
make -j$(nproc) install
FROM --platform=${PLATFORM} ${DISTRO}:${DEBIAN_VERSION} AS app
FROM --platform=${TARGETPLATFORM} ${DISTRO}:${DEBIAN_VERSION} AS app
ARG DISTRO
ARG ARCH