From 0e4b406278832aed6353da6b8018d251a377b8a8 Mon Sep 17 00:00:00 2001 From: Dengke Date: Mon, 27 Jan 2025 12:00:17 -0800 Subject: [PATCH 1/5] update submodules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-checksums | 2 +- crt/aws-lc | 2 +- crt/s2n | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 3982bd75..274a1d21 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 3982bd75fea74efd8f9b462b27fedd4599db4f53 +Subproject commit 274a1d21330731cc51bb742794adc70ada5f4380 diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 656762ae..fbbe2612 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 656762aefbee2bc8f509cb23cd107abff20a72bb +Subproject commit fbbe2612a3385d1ded02a52d20ad7fd2da4501f4 diff --git a/crt/aws-c-common b/crt/aws-c-common index 63187b97..5e6c0818 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 63187b976a482309e23296c5f967fc19c4131746 +Subproject commit 5e6c08186fa5d8c7679acf95b86ada4119ca23b8 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 0818f28e..1ae8664f 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 0818f28ee436b892f09fbe8e3a6ae37ff40e9436 +Subproject commit 1ae8664f90cb5ab5e23b161a31e021c6d3a28e72 diff --git a/crt/aws-checksums b/crt/aws-checksums index 0d2f5521..3e4101b9 160000 --- a/crt/aws-checksums +++ b/crt/aws-checksums @@ -1 +1 @@ -Subproject commit 0d2f5521f61215f38f791d106ae304402208112d +Subproject commit 3e4101b9f85a2c090774d27ae2131fca1082f522 diff --git a/crt/aws-lc b/crt/aws-lc index 8ffe277c..ffd6fb71 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 8ffe277c21915ca82dc78a3bdc6a92e10c284b92 +Subproject commit ffd6fb71b1e1582a620149337b77706f2391578d diff --git a/crt/s2n b/crt/s2n index ffe0bf42..6cc9f53d 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb +Subproject commit 6cc9f53d7ab5f0427ae5f838891fff57844a9e3f From e583e6924a9b8800e622c8a6a480dd9329a55b0f Mon Sep 17 00:00:00 2001 From: Dengke Date: Mon, 27 Jan 2025 12:10:31 -0800 Subject: [PATCH 2/5] size again --- .builder/actions/crt_size_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.builder/actions/crt_size_check.py b/.builder/actions/crt_size_check.py index 49c1d2c7..313aeaeb 100644 --- a/.builder/actions/crt_size_check.py +++ b/.builder/actions/crt_size_check.py @@ -11,7 +11,7 @@ def run(self, env): # Maximum package size (for current platform) in bytes # NOTE: if you increase this, you might also need to increase the # limit in continuous-delivery/pack.sh - max_size = 8_250_000 + max_size = 8_400_000 # size of current folder folder_size = 0 # total size in bytes From cbd697f03ec99a4214fbd1e872dbbfe31e740a32 Mon Sep 17 00:00:00 2001 From: Dengke Date: Mon, 27 Jan 2025 13:07:44 -0800 Subject: [PATCH 3/5] size --- .builder/actions/crt_size_check.py | 5 +++-- .github/workflows/ci.yml | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.builder/actions/crt_size_check.py b/.builder/actions/crt_size_check.py index 313aeaeb..fff50cf0 100644 --- a/.builder/actions/crt_size_check.py +++ b/.builder/actions/crt_size_check.py @@ -11,7 +11,7 @@ def run(self, env): # Maximum package size (for current platform) in bytes # NOTE: if you increase this, you might also need to increase the # limit in continuous-delivery/pack.sh - max_size = 8_400_000 + max_size = 9_000_000 # size of current folder folder_size = 0 # total size in bytes @@ -74,4 +74,5 @@ def run(self, env): print(f"Total NPM package file size: {total_size} bytes") if total_size > max_size: - raise Exception(f'NPM package exceeds size limit of {max_size} bytes.') + raise Exception(f'NPM package exceeds size limit of { + max_size} bytes.') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43d024c1..b399610a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,6 @@ jobs: image: - al2012-x64 - al2-x64 - - manylinux2014-aarch64 - manylinux2014-x64 - fedora-34-x64 - opensuse-leap @@ -46,6 +45,27 @@ jobs: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} + + linux-compat-armv8: + runs-on: codebuild-aws-crt-nodejs-arm64-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large + strategy: + fail-fast: false + matrix: + image: + - manylinux2014-aarch64 + steps: + - uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ env.CRT_CI_ROLE }} + aws-region: ${{ env.AWS_DEFAULT_REGION }} + # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages + - name: Build ${{ env.PACKAGE_NAME }} + run: | + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} + + musl-linux: runs-on: ubuntu-24.04 # latest strategy: From 50bbb2c08330a6dd8af5f566447a2007034a961f Mon Sep 17 00:00:00 2001 From: Dengke Date: Mon, 27 Jan 2025 15:12:49 -0800 Subject: [PATCH 4/5] format... --- .builder/actions/crt_size_check.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.builder/actions/crt_size_check.py b/.builder/actions/crt_size_check.py index fff50cf0..8d9cfeb1 100644 --- a/.builder/actions/crt_size_check.py +++ b/.builder/actions/crt_size_check.py @@ -74,5 +74,4 @@ def run(self, env): print(f"Total NPM package file size: {total_size} bytes") if total_size > max_size: - raise Exception(f'NPM package exceeds size limit of { - max_size} bytes.') + raise Exception(f'NPM package exceeds size limit of {max_size} bytes.') From 1b6de556e49a45aa7d9adc776691b2dce15841af Mon Sep 17 00:00:00 2001 From: Dengke Date: Mon, 27 Jan 2025 15:20:44 -0800 Subject: [PATCH 5/5] put it back, just downgrade --- .github/workflows/ci.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b399610a..8a1c15b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,13 +21,14 @@ permissions: jobs: linux-compat: - runs-on: ubuntu-24.04 # latest + runs-on: ubuntu-22.04 # temporarily downgrade to old ubuntu until https://github.com/actions/runner-images/issues/11471 resolves strategy: fail-fast: false matrix: image: - al2012-x64 - al2-x64 + - manylinux2014-aarch64 - manylinux2014-x64 - fedora-34-x64 - opensuse-leap @@ -45,27 +46,6 @@ jobs: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} - - linux-compat-armv8: - runs-on: codebuild-aws-crt-nodejs-arm64-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large - strategy: - fail-fast: false - matrix: - image: - - manylinux2014-aarch64 - steps: - - uses: aws-actions/configure-aws-credentials@v4 - with: - role-to-assume: ${{ env.CRT_CI_ROLE }} - aws-region: ${{ env.AWS_DEFAULT_REGION }} - # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages - - name: Build ${{ env.PACKAGE_NAME }} - run: | - aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} - - musl-linux: runs-on: ubuntu-24.04 # latest strategy: