Merge #951

951: remove actions-rs r=Alexhuszagh,reitermarkus a=Emilgardis

This essentially removes all actions-rs actions and replaces it with what is needed.

Reason for this is due to actions-rs being seemingly unmaintained

Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

.github/actions/cargo-install-upload-artifacts/action.yml

@@ -29,17 +29,15 @@ runs:
       shell: bash
 
     - name: Build with all features
-      uses: actions-rs/cargo@v1
-      with:
-        command: install
-        args: >
+      run:
+        cargo install
           --locked
           --path .
           --target ${{ inputs.target }}
           --all-features
           --root ${{ steps.metadata.outputs.out-dir }}
           --bins
-        use-cross: true
+      shell: ${{ contains(runner.os, 'windows') && 'pwsh' || 'bash' }}
       env:
         RUSTFLAGS: "" # Make sure to unset RUSTFLAGS
 

.github/actions/cargo-publish/action.yml

@@ -28,10 +28,8 @@ runs:
 
     - name: Log into crates.io
       if: github.event_name != 'pull_request'
-      uses: actions-rs/cargo@v1
-      with:
-        command: login
-        args: -- ${{ inputs.cargo-registry-token }}
+      run: cargo login -- ${{ inputs.cargo-registry-token }}
+      shell: bash
 
     - run: gh release delete --yes Unreleased || exit 0
       if: >
@@ -57,7 +55,5 @@ runs:
           ${{ steps.download-artifacts.outputs.download-path }}/cross-*/*
 
     - name: Publish crate
-      uses: actions-rs/cargo@v1
-      with:
-        command: publish
-        args: ${{ !startsWith(github.ref, 'refs/tags/v') && '--dry-run' || '' }}
+      run: cargo publish ${{ !startsWith(github.ref, 'refs/tags/v') && '--dry-run' || '' }}
+      shell: bash

.github/actions/setup-rust/action.yml

@@ -15,17 +15,15 @@ inputs:
 runs:
   using: composite
   steps:
-    # Work around for sporadic issues with rustup self-update on windows
-    - run: rustup set auto-self-update disable
-      if: contains(runner.os, 'windows')
-      shell: bash
     - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: ${{ inputs.toolchain }}
         target: ${{ inputs.target }}
-        default: true
         components: ${{ inputs.components }}
-        profile: minimal
+
+    - name: Install rust matcher
+      run: echo "::add-matcher::.github/actions/setup-rust/rust.json"
+      shell: bash
 
     - uses: Swatinem/[email protected]

.github/actions/setup-rust/rust.json

@@ -0,0 +1,31 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "rust",
+      "pattern": [
+        {
+          "regexp": "^(warning|warn|error)(\\[(.*)\\])?: (.*)$",
+          "severity": 1,
+          "message": 4,
+          "code": 3
+        },
+        {
+          "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
+          "file": 2,
+          "line": 3,
+          "column": 4
+        }
+      ]
+    },
+    {
+      "owner": "cross-rs",
+      "pattern": [
+        {
+          "regexp": "^\\[cross\\] (warning|error): (.*)$",
+          "severity": 1,
+          "message": 2
+        }
+      ]
+    }
+  ]
+}

.github/workflows/ci.yml

@@ -36,10 +36,7 @@ jobs:
           components: rustfmt
 
       - name: Run rustfmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: -- --check
+        run: cargo fmt -- --check
 
   clippy:
     runs-on: ${{ matrix.os }}
@@ -58,11 +55,7 @@ jobs:
           toolchain: 1.58.1 # MSRV, Minimally Supported Rust Version. Make sure to update README.md
 
       - name: Run clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --locked --all-targets --all-features --workspace -- -D warnings
-
+        run: cargo clippy --locked --all-targets --all-features --workspace -- -D warnings
   test:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -80,10 +73,7 @@ jobs:
           name: test-${{matrix.os}}
 
       - name: Run unit tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --locked --all-targets --workspace --all-features
+        run: cargo test --locked --all-targets --workspace --all-features
         timeout-minutes: 10
   check:
     runs-on: ubuntu-latest
@@ -94,7 +84,6 @@ jobs:
       - uses: ./.github/actions/setup-rust
       - run: cargo xtask ci-job check
         id: check
-        shell: bash
   generate-matrix:
     runs-on: ubuntu-latest
     outputs:
@@ -199,7 +188,6 @@ jobs:
         if: matrix.deploy
         with:
           target: ${{ matrix.target }}
-          image: ${{ steps.build-docker-image.outputs.image }}
 
       - name: Test Zig Image
         if: steps.prepare-meta.outputs.has-image && steps.prepare-meta.outputs.test-variant == 'zig'

src/lib.rs

@@ -756,15 +756,21 @@ pub(crate) fn warn_host_version_mismatch(
             host_version_meta.short_version_string
         );
         if versions.is_lt() || (versions.is_eq() && dates.is_lt()) {
-            msg_info.warn(format_args!("using older {rustc_warning}.\n > Update with `rustup update --force-non-host {toolchain}`"))?;
+            if cfg!(not(test)) {
+                msg_info.warn(format_args!("using older {rustc_warning}.\n > Update with `rustup update --force-non-host {toolchain}`"))?;
+            }
             return Ok(VersionMatch::OlderTarget);
         } else if versions.is_gt() || (versions.is_eq() && dates.is_gt()) {
-            msg_info.warn(format_args!(
-                "using newer {rustc_warning}.\n > Update with `rustup update`"
-            ))?;
+            if cfg!(not(test)) {
+                msg_info.warn(format_args!(
+                    "using newer {rustc_warning}.\n > Update with `rustup update`"
+                ))?;
+            }
             return Ok(VersionMatch::NewerTarget);
         } else {
-            msg_info.warn(format_args!("using {rustc_warning}."))?;
+            if cfg!(not(test)) {
+                msg_info.warn(format_args!("using {rustc_warning}."))?;
+            }
             return Ok(VersionMatch::Different);
         }
     }