Upload Windows artifacts into correct subdirectory

The Windows artifacts are uploaded to S3 as part of every build on
`master`, but due to slight differences in the upload command syntax
between Linux and Windows currently end up at the root of the upload
directory. Similar to the existing upload step for builds on `stable`,
the command has been tweaked to place the files into the `dist`
directory.
k

Author: jdno

.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 dist s3://rustup-builds/${{ github.sha }}
+          aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         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 dist s3://rustup-builds/${{ github.sha }}
+          aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         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 dist s3://rustup-builds/${{ github.sha }}
+          aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         env:
           AWS_DEFAULT_REGION: us-east-1
       - name: Clear the cargo caches

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 dist s3://rustup-builds/${{ github.sha }}
+          aws --debug s3 cp --recursive dist s3://rustup-builds/${{ github.sha }}/dist
         env:
           AWS_DEFAULT_REGION: us-east-1
       - name: Clear the cargo caches