CI: Correct AWS CLI support for Windows

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

Author: kinnison

.github/workflows/windows-builds-on-master.yaml

@@ -101,7 +101,7 @@ jobs:
         run: bash ci/run.bash
       - name: Acquire the AWS tooling
         run: |
-          pip3 install awscli
+          choco upgrade awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Prepare the dist
         run: |
@@ -110,11 +110,11 @@ jobs:
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Deploy build to dev-static dist tree for release team
         run: |
-          aws s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
-        shell: powershell
+          aws --debug s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-west-1
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Clear the cargo caches
         run: |

.github/workflows/windows-builds-on-pr.yaml

@@ -98,7 +98,7 @@ jobs:
         run: bash ci/run.bash
       - name: Acquire the AWS tooling
         run: |
-          pip3 install awscli
+          choco upgrade awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Prepare the dist
         run: |
@@ -107,11 +107,11 @@ jobs:
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Deploy build to dev-static dist tree for release team
         run: |
-          aws s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
-        shell: powershell
+          aws --debug s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-west-1
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Clear the cargo caches
         run: |

.github/workflows/windows-builds-on-stable.yaml

@@ -101,7 +101,7 @@ jobs:
         run: bash ci/run.bash
       - name: Acquire the AWS tooling
         run: |
-          pip3 install awscli
+          choco upgrade awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Prepare the dist
         run: |
@@ -110,11 +110,11 @@ jobs:
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Deploy build to dev-static dist tree for release team
         run: |
-          aws s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
-        shell: powershell
+          aws --debug s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-west-1
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Clear the cargo caches
         run: |

ci/actions-templates/windows-builds-template.yaml

@@ -109,7 +109,7 @@ jobs:
         run: bash ci/run.bash
       - name: Acquire the AWS tooling
         run: |
-          pip3 install awscli
+          choco upgrade awscli
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Prepare the dist
         run: |
@@ -118,11 +118,11 @@ jobs:
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Deploy build to dev-static dist tree for release team
         run: |
-          aws s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
-        shell: powershell
+          aws --debug s3 cp --recursive dist s3://dev-static-rust-lang-org/rustup/dist
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-west-1
         if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
       - name: Clear the cargo caches
         run: |