From eef26898986c953a22aa534d6afb6df25ff99cf0 Mon Sep 17 00:00:00 2001 From: Jan David Date: Tue, 9 Jul 2024 17:08:45 +0200 Subject: [PATCH] Fix uploading of Windows build artifacts On Windows, the `dist` folder is uploaded at the end of the build. This wasn't taken into consideration when introducing the new S3 bucket in --- .github/workflows/ci.yaml | 6 +++--- ci/actions-templates/windows-builds-template.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d160c33014..f342cf3240 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -166,7 +166,7 @@ jobs: - name: Deploy build to rustup-builds bucket for release team if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release' run: | - aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }} + aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }} env: AWS_DEFAULT_REGION: us-east-1 - name: Clear the cargo caches @@ -323,7 +323,7 @@ jobs: - name: Deploy build to rustup-builds bucket for release team if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release' run: | - aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }} + aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }} env: AWS_DEFAULT_REGION: us-east-1 - name: Clear the cargo caches @@ -486,7 +486,7 @@ jobs: - name: Deploy build to rustup-builds bucket for release team if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release' run: | - aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }} + aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }} env: AWS_DEFAULT_REGION: us-east-1 - name: Clear the cargo caches diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml index 0608da00df..60cf4e5cf5 100644 --- a/ci/actions-templates/windows-builds-template.yaml +++ b/ci/actions-templates/windows-builds-template.yaml @@ -159,7 +159,7 @@ jobs: # skip-master skip-pr skip-stable - name: Deploy build to rustup-builds bucket for release team if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.mode == 'release' run: | - aws --debug s3 cp --recursive deploy/ s3://rustup-builds/${{ github.sha }} + aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }} env: AWS_DEFAULT_REGION: us-east-1 - name: Clear the cargo caches