Merge remote-tracking branch 'origin/main' into sanity-check-shims

Author: chriskrycho

.github/workflows/api-docs.yml

@@ -15,9 +15,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.63
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Cargo Cache
         uses: Swatinem/rust-cache@v2
       - name: Build docs

.github/workflows/release.yml

@@ -41,39 +41,16 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.63
-      - name: Cargo Cache
-        uses: Swatinem/rust-cache@v2
+          target: aarch64-apple-darwin,x86_64-apple-darwin
       - name: Compile and package Volta
-        run: ./ci/build-macos-x86_64.sh volta-macos
+        run: ./ci/build-macos.sh volta-macos
       - name: Upload release artifact
         uses: actions/upload-artifact@v3
         with:
           name: macos
-          path: target/release/volta-macos.tar.gz
-
-  macos-aarch64:
-    name: Build - MacOS (ARM)
-    runs-on: macos-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-      - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.63
-          target: aarch64-apple-darwin
-      - name: Cargo Cache
-        uses: Swatinem/rust-cache@v2
-      - name: Compile and package Volta
-        run: ./ci/build-macos-arm.sh volta-macos-aarch64
-      - name: Upload release artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: macos-aarch64
-          path: target/aarch64-apple-darwin/release/volta-macos-aarch64.tar.gz
+          path: target/universal-apple-darwin/release/volta-macos.tar.gz
 
   windows:
     name: Build - Windows
@@ -82,34 +59,12 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.63
-      - name: Cargo Cache
-        uses: Swatinem/rust-cache@v2
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Add cargo-wix subcommand
         run: cargo install cargo-wix
       - name: Compile and package installer
         run: |
           cargo wix --nocapture --package volta --output target\wix\volta-windows.msi
-      - name: Load Certificate File
-        id: certificate_file
-        if: github.event_name == 'push'
-        uses: timheuer/base64-to-file@v1
-        with:
-          fileName: "volta-certificate.pfx"
-          encodedString: ${{ secrets.INSTALLER_CERTIFICATE }}
-      - name: Sign Installer
-        if: github.event_name == 'push'
-        env:
-          CERTIFICATE_FILE: ${{ steps.certificate_file.outputs.filePath }}
-          CERTIFICATE_PASSWORD: ${{ secrets.INSTALLER_CERTIFICATE_PASSWORD }}
-        run: |
-          & "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe" sign /fd sha256 /f "$env:CERTIFICATE_FILE" /p "$env:CERTIFICATE_PASSWORD" /tr http://ts.ssl.com /td sha256 /d "Volta: Start Your Engines" /du "https://volta.sh" "target\wix\volta-windows.msi"
-      - name: Verify Signature
-        if: github.event_name == 'push'
-        run: |
-          & "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe" verify /pa "target\wix\volta-windows.msi"
       - name: Create zip of binaries
         run: powershell Compress-Archive volta*.exe volta-windows.zip
         working-directory: ./target/release
@@ -130,7 +85,6 @@ jobs:
     needs:
       - linux
       - macos
-      - macos-aarch64
       - windows
     if: github.event_name == 'push'
     steps:
@@ -151,11 +105,6 @@ jobs:
         with:
           name: macos
           path: release
-      - name: Fetch MacOS (ARM) artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: macos-aarch64
-          path: release
       - name: Fetch Windows installer
         uses: actions/download-artifact@v2
         with:
@@ -195,15 +144,6 @@ jobs:
           asset_path: ./release/volta-macos.tar.gz
           asset_name: volta-${{ steps.release_info.outputs.version }}-macos.tar.gz
           asset_content_type: application/gzip
-      - name: Upload MacOS (ARM) artifact
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./release/volta-macos-aarch64.tar.gz
-          asset_name: volta-${{ steps.release_info.outputs.version }}-macos-aarch64.tar.gz
-          asset_content_type: application/gzip
       - name: Upload Windows installer
         uses: actions/upload-release-asset@v1
         env:

.github/workflows/test.yml

@@ -24,12 +24,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.63
-          components: clippy
-      - name: Cargo Cache
-        uses: Swatinem/rust-cache@v2
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Run tests
         run: |
           cargo test --all --features mock-network
@@ -48,11 +43,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.63
-      - name: Cargo Cache
-        uses: Swatinem/rust-cache@v2
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Run tests
         run: |
           cargo test --test smoke --features smoke-tests -- --test-threads 1
@@ -75,12 +66,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
       - name: Set up cargo
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.63
-          components: rustfmt
-      - name: Cargo Cache
-        uses: Swatinem/rust-cache@v2
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Run check
         run: |
           cargo fmt --all --quiet -- --check