From 16e1f428cf243e2cfd3fef21e6a7ec64cc605f46 Mon Sep 17 00:00:00 2001 From: Dengke Date: Tue, 7 Jan 2025 09:42:51 -0800 Subject: [PATCH] remove unneeded things --- continuous-delivery/build-binaries-linux-musl-arm64.yml | 5 +---- .../{musl-linux-build.sh => generic-linux-build.sh} | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) rename continuous-delivery/{musl-linux-build.sh => generic-linux-build.sh} (76%) diff --git a/continuous-delivery/build-binaries-linux-musl-arm64.yml b/continuous-delivery/build-binaries-linux-musl-arm64.yml index 3c3d6bc6..8fada88c 100644 --- a/continuous-delivery/build-binaries-linux-musl-arm64.yml +++ b/continuous-delivery/build-binaries-linux-musl-arm64.yml @@ -2,14 +2,11 @@ version: 0.2 phases: install: commands: - pre_build: - commands: - - export CC=gcc build: commands: - mkdir linux-arm64-musl - cd aws-crt-nodejs - - ./continuous-delivery/musl-linux-build.sh aws-crt-alpine-3.16-arm64 linux-aarch_64-musl + - ./continuous-delivery/generic-linux-build.sh aws-crt-alpine-3.16-arm64 - cp -r dist/bin/linux-arm64-musl/* ../linux-arm64-musl/ post_build: diff --git a/continuous-delivery/musl-linux-build.sh b/continuous-delivery/generic-linux-build.sh similarity index 76% rename from continuous-delivery/musl-linux-build.sh rename to continuous-delivery/generic-linux-build.sh index b3eb039c..cbe244fa 100755 --- a/continuous-delivery/musl-linux-build.sh +++ b/continuous-delivery/generic-linux-build.sh @@ -4,8 +4,6 @@ set -ex IMAGE_NAME=$1 shift -CLASSIFIER=$1 -shift # Pry the builder version this CRT is using out of ci.yml BUILDER_VERSION=$(cat .github/workflows/ci.yml | grep 'BUILDER_VERSION:' | sed 's/\s*BUILDER_VERSION:\s*\(.*\)/\1/') @@ -15,5 +13,5 @@ aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazona export DOCKER_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/${IMAGE_NAME}:${BUILDER_VERSION} export BRANCH_TAG=$(git describe --tags) -docker run --mount type=bind,src=$(pwd),dst=/root/aws-crt-nodejs --env CXXFLAGS --env AWS_CRT_ARCH $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-nodejs --classifier ${CLASSIFIER} --branch ${BRANCH_TAG} run_tests=false +docker run --mount type=bind,src=$(pwd),dst=/root/aws-crt-nodejs --env CXXFLAGS $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-nodejs --branch ${BRANCH_TAG} run_tests=false docker container prune -f