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

Author: untitaker

.github/workflows/api-docs.yml

@@ -11,20 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Set up cargo
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
+          toolchain: 1.63
+      - name: Cargo Cache
+        uses: Swatinem/rust-cache@v2
       - name: Build docs
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --all --features cross-platform-docs --no-deps --document-private-items
+        run: |
+          cargo doc --all --features cross-platform-docs --no-deps --document-private-items
       - name: Prepare docs for publication
         run: |
           mkdir -p publish

.github/workflows/release.yml

@@ -9,96 +9,39 @@ on:
 name: Production
 
 jobs:
-  centos:
-    name: Build - CentOS / RHEL
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up docker image
-        run: docker build -t volta .
-        working-directory: ./ci/docker-centos
-      - name: Compile and package Volta
-        run: docker run --volume ${PWD}:/root/workspace --workdir /root/workspace --rm --init --tty volta /root/workspace/ci/build-and-package.sh volta-centos
-      - name: Confirm correct OpenSSL Version
-        run: |
-          objdump -p target/release/volta
-          readelf -d target/release/volta
-      - name: Upload release artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: linux-centos
-          path: target/release/volta-centos.tar.gz
-
-  linux-ssl-3:
-    name: Build - OpenSSL 3
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up docker image
-        run: docker build -t volta .
-        working-directory: ./ci/docker-ubuntu
-      - name: Compile and package Volta
-        run: docker run --volume ${PWD}:/root/workspace --workdir /root/workspace --rm --init --tty volta /root/workspace/ci/build-and-package.sh volta-openssl-3
-      - name: Confirm correct OpenSSL Version
-        run: |
-          objdump -p target/release/volta
-          readelf -d target/release/volta
-      - name: Upload release artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: linux-openssl-3
-          path: target/release/volta-openssl-3.tar.gz
-
   linux:
-    strategy:
-      matrix:
-        openssl:
-          - 1_1_0
-          - 1_0_1
-    name: Build - OpenSSL ${{ matrix.openssl }}
+    name: Build - Linux
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
-      - name: Check out OpenSSL
-        uses: actions/checkout@v2
-        with:
-          repository: openssl/openssl
-          ref: OpenSSL_${{ matrix.openssl }}-stable
-          path: openssl
+        uses: actions/checkout@v3
       - name: Set up docker image
         run: docker build -t volta .
-        working-directory: ./ci/docker-centos
-      - name: Compile and package OpenSSL & Volta
-        run: docker run --volume ${PWD}:/root/workspace --workdir /root/workspace --rm --init --tty volta /root/workspace/ci/build-with-openssl.sh volta-openssl-${{ matrix.openssl }}
-      - name: Confirm OpenSSL Version
-        run: |
-          objdump -p target/release/volta
-          readelf -d target/release/volta
+        working-directory: ./ci/docker
+      - name: Compile and package Volta
+        run: docker run --volume ${PWD}:/root/workspace --workdir /root/workspace --rm --init --tty volta /root/workspace/ci/build-linux.sh volta-linux
       - name: Upload release artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: linux-openssl-${{ matrix.openssl }}
-          path: target/release/volta-openssl-${{ matrix.openssl }}.tar.gz
+          name: linux
+          path: target/release/volta-linux.tar.gz
 
   macos:
     name: Build - MacOS
     runs-on: macos-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up cargo
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
+          toolchain: 1.63
+      - name: Cargo Cache
+        uses: Swatinem/rust-cache@v2
       - name: Compile and package Volta
-        run: ./ci/build-and-package.sh volta-macos
+        run: ./ci/build-macos-x86_64.sh volta-macos
       - name: Upload release artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos
           path: target/release/volta-macos.tar.gz
@@ -108,18 +51,18 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up cargo
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
-          toolchain: stable
+          toolchain: 1.63
           target: aarch64-apple-darwin
-          override: true
+      - name: Cargo Cache
+        uses: Swatinem/rust-cache@v2
       - name: Compile and package Volta
-        run: ./ci/build-for-arm.sh volta-macos-aarch64
+        run: ./ci/build-macos-arm.sh volta-macos-aarch64
       - name: Upload release artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: macos-aarch64
           path: target/aarch64-apple-darwin/release/volta-macos-aarch64.tar.gz
@@ -129,23 +72,18 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up cargo
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
+          toolchain: 1.63
+      - name: Cargo Cache
+        uses: Swatinem/rust-cache@v2
       - name: Add cargo-wix subcommand
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-wix
+        run: cargo install cargo-wix
       - name: Compile and package installer
-        uses: actions-rs/cargo@v1
-        with:
-          command: wix
-          args: --nocapture --package volta --output target\wix\volta-windows.msi
+        run: |
+          cargo wix --nocapture --package volta --output target\wix\volta-windows.msi
       - name: Load Certificate File
         id: certificate_file
         if: github.event_name == 'push'
@@ -168,12 +106,12 @@ jobs:
         run: powershell Compress-Archive volta*.exe volta-windows.zip
         working-directory: ./target/release
       - name: Upload installer
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows-installer
           path: target/wix/volta-windows.msi
       - name: Upload zip
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: windows-zip
           path: target/release/volta-windows.zip
@@ -182,40 +120,23 @@ jobs:
     name: Publish release
     runs-on: ubuntu-latest
     needs:
-      - centos
       - linux
-      - linux-ssl-3
       - macos
       - macos-aarch64
       - windows
     if: github.event_name == 'push'
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Determine release version
         id: release_info
         env:
           TAG: ${{ github.ref }}
-        run: echo "::set-output name=version::${TAG:11}"
-      - name: Fetch CentOS artifact
+        run: echo "version=${TAG:11}" >> $GITHUB_OUTPUT
+      - name: Fetch Linux artifact
         uses: actions/download-artifact@v2
         with:
-          name: linux-centos
-          path: release
-      - name: Fetch OpenSSL 3 artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: linux-openssl-3
-          path: release
-      - name: Fetch OpenSSL 1.0.* artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: linux-openssl-1_0_1
-          path: release
-      - name: Fetch OpenSSL 1.1.* artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: linux-openssl-1_1_0
+          name: linux
           path: release
       - name: Fetch MacOS artifact
         uses: actions/download-artifact@v2
@@ -248,41 +169,14 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
           draft: true
-      - name: Upload CentOS 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-centos.tar.gz
-          asset_name: volta-${{ steps.release_info.outputs.version }}-linux-openssl-rhel.tar.gz
-          asset_content_type: application/gzip
-      - name: Upload OpenSSL 3 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-openssl-3.tar.gz
-          asset_name: volta-${{ steps.release_info.outputs.version }}-linux-openssl-3.0.tar.gz
-          asset_content_type: application/gzip
-      - name: Upload OpenSSL 1.0.* 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-openssl-1_0_1.tar.gz
-          asset_name: volta-${{ steps.release_info.outputs.version }}-linux-openssl-1.0.tar.gz
-          asset_content_type: application/gzip
-      - name: Upload OpenSSL 1.1.* artifact
+      - name: Upload Linux 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-openssl-1_1_0.tar.gz
-          asset_name: volta-${{ steps.release_info.outputs.version }}-linux-openssl-1.1.tar.gz
+          asset_path: ./release/volta-linux.tar.gz
+          asset_name: volta-${{ steps.release_info.outputs.version }}-linux.tar.gz
           asset_content_type: application/gzip
       - name: Upload MacOS artifact
         uses: actions/upload-release-asset@v1