From 1e604afb0957ccdf665e5ab446168bf167604d51 Mon Sep 17 00:00:00 2001
From: Arpad Borsos <swatinem@swatinem.de>
Date: Mon, 31 Jul 2023 15:31:10 +0200
Subject: [PATCH] Update workflow definitions

- Use rust `--no-self-update` flag instead of separate command.
- Add an explicit test for the `git` registry, as the sparse registry is now the default.
---
 .github/workflows/coverage.yml                           | 6 +-----
 .../workflows/{sparse-registry.yml => git-registry.yml}  | 9 ++-------
 .github/workflows/install.yml                            | 6 +-----
 .github/workflows/simple.yml                             | 6 +-----
 .github/workflows/target-dir.yml                         | 6 +-----
 .github/workflows/workspaces.yml                         | 6 +-----
 6 files changed, 7 insertions(+), 32 deletions(-)
 rename .github/workflows/{sparse-registry.yml => git-registry.yml} (57%)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 0605809..d73ea46 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -18,11 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
-      # This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
-      - run: |
-          rustup set auto-self-update disable
-          rustup toolchain install stable --profile minimal --component llvm-tools-preview
+      - run: rustup toolchain install stable --profile minimal --component llvm-tools-preview --no-self-update
 
       - uses: taiki-e/install-action@cargo-llvm-cov
 
diff --git a/.github/workflows/sparse-registry.yml b/.github/workflows/git-registry.yml
similarity index 57%
rename from .github/workflows/sparse-registry.yml
rename to .github/workflows/git-registry.yml
index ceba6ad..d854ce5 100644
--- a/.github/workflows/sparse-registry.yml
+++ b/.github/workflows/git-registry.yml
@@ -14,17 +14,12 @@ jobs:
 
     env:
       CARGO_TERM_COLOR: always
-      CARGO_UNSTABLE_SPARSE_REGISTRY: true
+      CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
 
     steps:
       - uses: actions/checkout@v3
 
-      # When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
-      # This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
-      - run: |
-          rustup set auto-self-update disable
-          rustup toolchain install nightly --profile minimal
-          rustup default nightly
+      - run: rustup toolchain install stable --profile minimal --no-self-update
 
       - uses: ./
         with:
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 0d0e4b6..7d3b484 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -18,11 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
-      # This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
-      - run: |
-          rustup set auto-self-update disable
-          rustup toolchain install stable --profile minimal
+      - run: rustup toolchain install stable --profile minimal --no-self-update
 
       - uses: ./
 
diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml
index 5e845b4..628cfab 100644
--- a/.github/workflows/simple.yml
+++ b/.github/workflows/simple.yml
@@ -18,11 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
-      # This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
-      - run: |
-          rustup set auto-self-update disable
-          rustup toolchain install stable --profile minimal
+      - run: rustup toolchain install stable --profile minimal --no-self-update
 
       - uses: ./
         with:
diff --git a/.github/workflows/target-dir.yml b/.github/workflows/target-dir.yml
index 3ee121a..0e43b4e 100644
--- a/.github/workflows/target-dir.yml
+++ b/.github/workflows/target-dir.yml
@@ -18,11 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
-      # This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
-      - run: |
-          rustup set auto-self-update disable
-          rustup toolchain install stable --profile minimal
+      - run: rustup toolchain install stable --profile minimal --no-self-update
 
       # the `workspaces` option has the format `$workspace -> $target-dir`
       # and the `$target-dir` is relative to the `$workspace`.
diff --git a/.github/workflows/workspaces.yml b/.github/workflows/workspaces.yml
index 9bcd3d7..ee617b0 100644
--- a/.github/workflows/workspaces.yml
+++ b/.github/workflows/workspaces.yml
@@ -18,11 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # When rustup is updated, it tries to replace its binary, which on Windows is somehow locked.
-      # This can result in the CI failure, see: https://github.com/rust-lang/rustup/issues/3029
-      - run: |
-          rustup set auto-self-update disable
-          rustup toolchain install stable --profile minimal --target wasm32-unknown-unknown
+      - run: rustup toolchain install stable --profile minimal --target wasm32-unknown-unknown --no-self-update
 
       - uses: ./
         with: