diff --git a/codebuild/cd/musl-arm64-build.yml b/codebuild/cd/musl-arm64-build.yml index 70bfc402a..c6e12cb97 100644 --- a/codebuild/cd/musl-arm64-build.yml +++ b/codebuild/cd/musl-arm64-build.yml @@ -8,7 +8,7 @@ phases: build: commands: - cd aws-crt-java - - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-arm64 linux-aarch_64-musl linux/aarch64 + - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-arm64 linux-aarch_64-musl linux/aarch64 aarch64 post_build: commands: diff --git a/codebuild/cd/musl-armv7-build.yml b/codebuild/cd/musl-armv7-build.yml index d7cfdca74..b7150a4cb 100644 --- a/codebuild/cd/musl-armv7-build.yml +++ b/codebuild/cd/musl-armv7-build.yml @@ -9,7 +9,7 @@ phases: commands: - cd aws-crt-java - export AWS_CRT_ARCH=armv7 - - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-armv7 linux-armv7-musl linux/arm/v7 + - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-armv7 linux-armv7-musl linux/arm/v7 armv7 post_build: commands: diff --git a/codebuild/cd/musl-linux-build.sh b/codebuild/cd/musl-linux-build.sh index 1e0414f2c..0840263ed 100755 --- a/codebuild/cd/musl-linux-build.sh +++ b/codebuild/cd/musl-linux-build.sh @@ -8,6 +8,8 @@ CLASSIFIER=$1 shift PLATFORM=$1 shift +ARCH=$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/') @@ -17,7 +19,7 @@ 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-java --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --platform=${PLATFORM} $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-java --classifier ${CLASSIFIER} --branch ${BRANCH_TAG} run_tests=false +docker run --mount type=bind,src=$(pwd),dst=/root/aws-crt-java --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --platform=${PLATFORM} $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-java --target linux-${ARCH} --classifier ${CLASSIFIER} --branch ${BRANCH_TAG} run_tests=false docker container prune -f # Upload the artifacts to S3 diff --git a/codebuild/cd/musl-x64-build.yml b/codebuild/cd/musl-x64-build.yml index 4d9e4d6b6..e8695c560 100644 --- a/codebuild/cd/musl-x64-build.yml +++ b/codebuild/cd/musl-x64-build.yml @@ -8,7 +8,7 @@ phases: build: commands: - cd aws-crt-java - - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-x64 linux-x86_64-musl linux/amd64 + - ./codebuild/cd/musl-linux-build.sh aws-crt-alpine-3.16-x64 linux-x86_64-musl linux/amd64 amd64 post_build: commands: