Skip to content

Commit a6ad6e9

Browse files
authored
Remove temporary awscli s3-r2 workaround (#29393)
* Remove temporary awscli s3-r2 workaround Signed-off-by: Michael Telatynski <[email protected]> * Iterate Signed-off-by: Michael Telatynski <[email protected]> * Update build_develop.yml --------- Signed-off-by: Michael Telatynski <[email protected]>
1 parent d88776e commit a6ad6e9

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

.github/workflows/build_develop.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ jobs:
2626
R2_URL: ${{ vars.CF_R2_S3_API }}
2727
R2_PUBLIC_URL: "https://element-web-develop.element.io"
2828
steps:
29-
# Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj
30-
- uses: unfor19/install-aws-cli-action@v1
31-
with:
32-
version: 2.22.35
33-
verbose: false
34-
arch: amd64
3529
- uses: actions/checkout@v4
3630

3731
- uses: actions/setup-node@v4
@@ -115,10 +109,11 @@ jobs:
115109
# We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
116110
# as the expires after 24h and requires auth to download.
117111
# Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
112+
# Checksum algorithm specified as per https://developers.cloudflare.com/r2/examples/aws/aws-cli/
118113
- name: Deploy to R2
119114
run: |
120-
aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto
121-
aws s3 cp _deploy/ s3://$R2_BUCKET/ --recursive --endpoint-url $R2_URL --region=auto
115+
aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto --checksum-algorithm CRC32
116+
aws s3 cp _deploy/ s3://$R2_BUCKET/ --recursive --endpoint-url $R2_URL --region=auto --checksum-algorithm CRC32
122117
env:
123118
AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
124119
AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}

0 commit comments

Comments
 (0)