From 534f66e60190a9a6c675508fa29e3b483e75e99a Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Thu, 9 Jun 2022 09:34:46 +0200 Subject: [PATCH] fix(build): fixed circleCI artifacts publish for arm64. Signed-off-by: Federico Di Pierro --- .circleci/config.yml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ecde9e9..b3915859 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,38 +11,43 @@ jobs: - run: name: Prepare project command: | - mkdir -p /tmp/build && mkdir -p /tmp/build/release && \ - docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build:/build \ + mkdir -p /tmp/build-arm64 && mkdir -p /tmp/build-arm64/release && \ + docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build-arm64:/build \ falcosecurity/falco-builder:latest \ cmake - run: name: Build command: | - docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build:/build \ + docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build-arm64:/build \ falcosecurity/falco-builder:latest \ all - run: name: Run unit tests command: | - docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build:/build \ + docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build-arm64:/build \ falcosecurity/falco-builder:latest \ tests - run: name: Build packages command: | - docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build:/build \ + docker run -e BUILD_TYPE="release" -it -v /tmp/source:/source -v /tmp/build-arm64:/build \ falcosecurity/falco-builder:latest \ package - run: name: Prepare Artifacts command: | mkdir -p /tmp/packages - cp /tmp/build/release/*.deb /tmp/packages - cp /tmp/build/release/*.tar.gz /tmp/packages - cp /tmp/build/release/*.rpm /tmp/packages + cp /tmp/build-arm64/release/*.deb /tmp/packages + cp /tmp/build-arm64/release/*.tar.gz /tmp/packages + cp /tmp/build-arm64/release/*.rpm /tmp/packages - store_artifacts: path: /tmp/packages destination: /packages + - persist_to_workspace: + root: /tmp + paths: + - build-arm64/release + - source # Build a statically linked Falco release binary using musl # This build is 100% static, there are no host dependencies "build-musl": @@ -249,13 +254,13 @@ jobs: name: Publish rpm-dev command: | FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//') - /source/falco/scripts/publish-rpm -f /build/release/falco-${FALCO_VERSION}-x86_64.rpm -f /build/release/falco-${FALCO_VERSION}-aarch64.rpm -r rpm-dev + /source/falco/scripts/publish-rpm -f /build/release/falco-${FALCO_VERSION}-x86_64.rpm -f /build-arm64/release/falco-${FALCO_VERSION}-aarch64.rpm -r rpm-dev - run: name: Publish bin-dev command: | FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//') /source/falco/scripts/publish-bin -f /build/release/falco-${FALCO_VERSION}-x86_64.tar.gz -r bin-dev -a x86_64 - /source/falco/scripts/publish-bin -f /build/release/falco-${FALCO_VERSION}-aarch64.tar.gz -r bin-dev -a aarch64 + /source/falco/scripts/publish-bin -f /build-arm64/release/falco-${FALCO_VERSION}-aarch64.tar.gz -r bin-dev -a aarch64 - run: name: Publish bin-static-dev command: | @@ -279,7 +284,7 @@ jobs: name: Publish deb-dev command: | FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//') - /source/falco/scripts/publish-deb -f /build/release/falco-${FALCO_VERSION}-x86_64.deb -f /build/release/falco-${FALCO_VERSION}-aarch64.deb -r deb-dev + /source/falco/scripts/publish-deb -f /build/release/falco-${FALCO_VERSION}-x86_64.deb -f /build-arm64/release/falco-${FALCO_VERSION}-aarch64.deb -r deb-dev # Publish docker packages "publish-docker-dev": @@ -365,13 +370,13 @@ jobs: name: Publish rpm command: | FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//') - /source/falco/scripts/publish-rpm -f /build/release/falco-${FALCO_VERSION}-x86_64.rpm -f /build/release/falco-${FALCO_VERSION}-aarch64.rpm -r rpm + /source/falco/scripts/publish-rpm -f /build/release/falco-${FALCO_VERSION}-x86_64.rpm -f /build-arm64/release/falco-${FALCO_VERSION}-aarch64.rpm -r rpm - run: name: Publish bin command: | FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//') /source/falco/scripts/publish-bin -f /build/release/falco-${FALCO_VERSION}-x86_64.tar.gz -r bin -a x86_64 - /source/falco/scripts/publish-bin -f /build/release/falco-${FALCO_VERSION}-aarch64.tar.gz -r bin -a aarch64 + /source/falco/scripts/publish-bin -f /build-arm64/release/falco-${FALCO_VERSION}-aarch64.tar.gz -r bin -a aarch64 - run: name: Publish bin-static command: | @@ -395,7 +400,7 @@ jobs: name: Publish deb command: | FALCO_VERSION=$(cat /build/release/userspace/falco/config_falco.h | grep 'FALCO_VERSION ' | cut -d' ' -f3 | sed -e 's/^"//' -e 's/"$//') - /source/falco/scripts/publish-deb -f /build/release/falco-${FALCO_VERSION}-x86_64.deb -f /build/release/falco-${FALCO_VERSION}-aarch64.deb -r deb + /source/falco/scripts/publish-deb -f /build/release/falco-${FALCO_VERSION}-x86_64.deb -f /build-arm64/release/falco-${FALCO_VERSION}-aarch64.deb -r deb # Publish docker packages "publish-docker": docker: