From b6da56fcded16b26fd48a1062bb83f1a35fcf1f8 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Tue, 21 Jul 2026 09:52:21 -0700 Subject: [PATCH 1/8] update submodules --- crt/aws-c-common | 2 +- crt/aws-c-s3 | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-lc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index a9d57d2d3..3c69b871d 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit a9d57d2d372582fa18bf1d81741e107c59a23226 +Subproject commit 3c69b871dfa1815231802febf1bb6899f84cccdb diff --git a/crt/aws-c-s3 b/crt/aws-c-s3 index 142f6c3a1..1f29ef887 160000 --- a/crt/aws-c-s3 +++ b/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 142f6c3a12f02b77008676e9c18d163b8ea46a6f +Subproject commit 1f29ef8871a27dc8b90325418780659bac534d71 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 727df06fc..cb14fea36 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 727df06fc0e998e673de70fb69e5a634fe4979bc +Subproject commit cb14fea362c82c995eebd34e2e96590ab4e0ed58 diff --git a/crt/aws-lc b/crt/aws-lc index 6f246af4c..970583b10 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 6f246af4cd1de8cee8c62d76139bcda299c1aa00 +Subproject commit 970583b1061b407d09b5fc1f18bbba38690e1684 From 89357379ed905e31295064e57df88a6c44661441 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Tue, 21 Jul 2026 13:15:54 -0700 Subject: [PATCH 2/8] s2n v1.7.5 -> v1.7.6, revert aws-lc --- crt/aws-lc | 2 +- crt/s2n | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crt/aws-lc b/crt/aws-lc index 970583b10..6f246af4c 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 970583b1061b407d09b5fc1f18bbba38690e1684 +Subproject commit 6f246af4cd1de8cee8c62d76139bcda299c1aa00 diff --git a/crt/s2n b/crt/s2n index f5f6c6c2c..66b1c94d1 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit f5f6c6c2ce2370de1aa3ade6899a7321d1127bb8 +Subproject commit 66b1c94d1dfc99b237427cbde230eca63bb8b89c From 7c4503c7174874c342f990168aeafd1429266fba Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Tue, 21 Jul 2026 14:50:03 -0700 Subject: [PATCH 3/8] fix freebsd ci by bumping to 14.2, adding 8GB of memory, and using cpa.sh --- .github/workflows/ci.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5e8abf18..3158e6290 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -413,6 +413,9 @@ jobs: runs-on: ubuntu-24.04 # latest permissions: id-token: write # This is required for requesting the JWT + defaults: + run: + shell: cpa.sh {0} steps: - name: configure AWS credentials (containers) uses: aws-actions/configure-aws-credentials@v4 @@ -423,19 +426,21 @@ jobs: with: submodules: true - - name: Build ${{ env.PACKAGE_NAME }} + consumers + - name: Start VM uses: cross-platform-actions/action@v1.3.0 with: operating_system: freebsd - version: '14.0' + version: '14.2' cpu_count: 4 - shell: bash + memory: 8G environment_variables: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN AWS_DEFAULT_REGION - run: | - sudo pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" - chmod a+x builder - ./builder build -p ${{ env.PACKAGE_NAME }} + + - name: Build ${{ env.PACKAGE_NAME }} + consumers + run: | + sudo pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" + chmod a+x builder + ./builder build -p ${{ env.PACKAGE_NAME }} # check that tests requiring custom env-vars or AWS credentials are simply skipped tests-ok-without-creds: From 3805e9deb75c5fe058ed6b20a07c391c0d452632 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Tue, 21 Jul 2026 17:06:31 -0700 Subject: [PATCH 4/8] try freebsd 14.1 instead of 14.2 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3158e6290..2e7d174f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -430,7 +430,7 @@ jobs: uses: cross-platform-actions/action@v1.3.0 with: operating_system: freebsd - version: '14.2' + version: '14.1' cpu_count: 4 memory: 8G environment_variables: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN AWS_DEFAULT_REGION From e6d9696c112c2aa4cd96f79eb03690ed756029f1 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Tue, 21 Jul 2026 17:17:39 -0700 Subject: [PATCH 5/8] try bootstrap and update with -f --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e7d174f4..183763c4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,6 +437,8 @@ jobs: - name: Build ${{ env.PACKAGE_NAME }} + consumers run: | + sudo pkg bootstrap -f + sudo pkg update -f sudo pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" chmod a+x builder From 5f1347d656569464b629b0e5aab7fb3c0bee3a2f Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Tue, 21 Jul 2026 18:05:10 -0700 Subject: [PATCH 6/8] assume always yes for pkg --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 183763c4b..2db47b35a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -436,6 +436,8 @@ jobs: environment_variables: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN AWS_DEFAULT_REGION - name: Build ${{ env.PACKAGE_NAME }} + consumers + env: + ASSUME_ALWAYS_YES: yes run: | sudo pkg bootstrap -f sudo pkg update -f From 7a247627fa9ca15ae067d46416e3dea71d8a52d4 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Wed, 22 Jul 2026 07:45:57 -0700 Subject: [PATCH 7/8] sudo strips env variables. use sudo -E --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2db47b35a..0ed94e59c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -436,12 +436,11 @@ jobs: environment_variables: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN AWS_DEFAULT_REGION - name: Build ${{ env.PACKAGE_NAME }} + consumers - env: - ASSUME_ALWAYS_YES: yes run: | - sudo pkg bootstrap -f - sudo pkg update -f - sudo pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake + export ASSUME_ALWAYS_YES=yes + sudo -E pkg bootstrap -f + sudo -E pkg update -f + sudo -E pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" chmod a+x builder ./builder build -p ${{ env.PACKAGE_NAME }} From b9c98870c3ffc09e73bbfbd2f3fdc32628b69cf9 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Wed, 22 Jul 2026 08:05:02 -0700 Subject: [PATCH 8/8] try reverting back to run, just change the memory to avoid OOM --- .github/workflows/ci.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ed94e59c..77e98ae8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -413,9 +413,6 @@ jobs: runs-on: ubuntu-24.04 # latest permissions: id-token: write # This is required for requesting the JWT - defaults: - run: - shell: cpa.sh {0} steps: - name: configure AWS credentials (containers) uses: aws-actions/configure-aws-credentials@v4 @@ -426,24 +423,23 @@ jobs: with: submodules: true - - name: Start VM + - name: Build ${{ env.PACKAGE_NAME }} + consumers uses: cross-platform-actions/action@v1.3.0 with: operating_system: freebsd version: '14.1' cpu_count: 4 memory: 8G + shell: bash environment_variables: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN AWS_DEFAULT_REGION - - - name: Build ${{ env.PACKAGE_NAME }} + consumers - run: | - export ASSUME_ALWAYS_YES=yes - sudo -E pkg bootstrap -f - sudo -E pkg update -f - sudo -E pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake - python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" - chmod a+x builder - ./builder build -p ${{ env.PACKAGE_NAME }} + run: | + export ASSUME_ALWAYS_YES=yes + sudo -E pkg bootstrap -f + sudo -E pkg update -f + sudo -E pkg install -y python3 devel/py-pip net/py-urllib3 devel/py-awscli cmake + python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')" + chmod a+x builder + ./builder build -p ${{ env.PACKAGE_NAME }} # check that tests requiring custom env-vars or AWS credentials are simply skipped tests-ok-without-creds: