From 327615d0b356bc85f8961a589893066b1b722118 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 24 Jan 2025 12:08:18 +0000 Subject: [PATCH 1/2] Work around cloudflare R2 / aws client incompatability Hopefully... https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj --- .github/workflows/build_and_deploy.yaml | 2 ++ .github/workflows/build_prepare.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index b81f05ff..49e70338 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -285,3 +285,5 @@ jobs: done env: VERSION: ${{ github.event.release.tag_name }} + # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj + AWS_REQUEST_CHECKSUM_CALCULATION: when_required diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml index 8d54c858..bd00f306 100644 --- a/.github/workflows/build_prepare.yaml +++ b/.github/workflows/build_prepare.yaml @@ -93,6 +93,8 @@ jobs: env: AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }} + # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj + AWS_REQUEST_CHECKSUM_CALCULATION: when_required R2_BUCKET: ${{ vars.R2_BUCKET }} R2_URL: ${{ vars.CF_R2_S3_API }} From 294143531da9e625574a3d8dfa44cc74035ddfa3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 24 Jan 2025 12:19:27 +0000 Subject: [PATCH 2/2] Re-jig Remove from the one that's ging to actual s3, add on another r2 --- .github/workflows/build_and_deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 49e70338..eaaae413 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -206,6 +206,8 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }} R2_URL: ${{ vars.CF_R2_S3_API }} DEPLOYMENT_DIR: ${{ needs.prepare.outputs.packages-dir }} + # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj + AWS_REQUEST_CHECKSUM_CALCULATION: when_required - name: Notify packages.element.io of new files if: needs.prepare.outputs.deploy == 'true' @@ -285,5 +287,3 @@ jobs: done env: VERSION: ${{ github.event.release.tag_name }} - # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj - AWS_REQUEST_CHECKSUM_CALCULATION: when_required