Merge pull request #407 from artichoke/lopopolo/rust-audit-setup-rust

Use setup-rust/audit action for Rust audit jobs
artichoke · Dec 21, 2022 · 5289869 · 5289869
2 parents 12f1ba4 + 6f8f013
commit 5289869
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/github-org-artichoke/templates/audit-workflow-node-ruby-rust.yaml b/github-org-artichoke/templates/audit-workflow-node-ruby-rust.yaml
@@ -58,27 +58,12 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Rust toolchain
-        run: |
-          echo "::group::rustup toolchain install"
-          rustup toolchain install stable --profile minimal
-          echo "::endgroup::"
-          echo "::group::set default toolchain"
-          rustup default stable
-          echo "::endgroup::"
-          echo "::group::rustup version"
-          rustup -Vv
-          echo "::endgroup::"
-          echo "::group::rustc version"
-          rustc -Vv
-          echo "::endgroup::"
-          echo "::group::cargo version"
-          cargo version --verbose
-          echo "::endgroup::"
+        uses: artichoke/setup-rust/audit@v1
 
       - name: Generate Cargo.lock
         run: |
           if [[ ! -f "Cargo.lock" ]]; then
-            cargo +stable generate-lockfile --verbose
+            cargo generate-lockfile --verbose
           fi
 
       - uses: EmbarkStudios/cargo-deny-action@v1

diff --git a/github-org-artichoke/templates/audit-workflow-ruby-rust.yaml b/github-org-artichoke/templates/audit-workflow-ruby-rust.yaml
@@ -44,27 +44,12 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Rust toolchain
-        run: |
-          echo "::group::rustup toolchain install"
-          rustup toolchain install stable --profile minimal
-          echo "::endgroup::"
-          echo "::group::set default toolchain"
-          rustup default stable
-          echo "::endgroup::"
-          echo "::group::rustup version"
-          rustup -Vv
-          echo "::endgroup::"
-          echo "::group::rustc version"
-          rustc -Vv
-          echo "::endgroup::"
-          echo "::group::cargo version"
-          cargo version --verbose
-          echo "::endgroup::"
+        uses: artichoke/setup-rust/audit@v1
 
       - name: Generate Cargo.lock
         run: |
           if [[ ! -f "Cargo.lock" ]]; then
-            cargo +stable generate-lockfile --verbose
+            cargo generate-lockfile --verbose
           fi
 
       - uses: EmbarkStudios/cargo-deny-action@v1

diff --git a/modules/update-github-repository-file/outputs.tf b/modules/update-github-repository-file/outputs.tf
@@ -1,7 +1,7 @@
 output "branch_href" {
   description = "Link to the newly-created branch"
   value = join("/", [
-    "https://github.com/",
+    "https://github.com",
     var.organization,
     var.repository,
     "tree",