ci: fix tool installs

actix · Dec 28, 2024 · eca28f3 · eca28f3
1 parent 0633fd4
commit eca28f3
Show file tree

Hide file tree

Showing 4 changed files with 577 additions and 531 deletions.
diff --git a/.github/workflows/ci-nightly.yml b/.github/workflows/ci-nightly.yml
@@ -21,10 +21,15 @@ jobs:
         with:
           toolchain: ${{ matrix.version }}
 
+      - name: Install cargo-binstall,cargo-ci-cache-clean
+        uses: taiki-e/install-action@v2.46.20
+        with:
+          tool: cargo-binstall,cargo-ci-cache-clean
+
       - name: Install DB CLI tools
         run: |
-          cargo install sqlx-cli --no-default-features --features=rustls,sqlite
-          cargo install diesel_cli --no-default-features --features sqlite
+          cargo binstall sqlx-cli --no-default-features --features=rustls,sqlite
+          cargo binstall diesel_cli --no-default-features --features sqlite
 
       - name: Create Test DBs
         env:
@@ -58,10 +63,5 @@ jobs:
           cargo test -p=db-diesel --no-fail-fast -- --nocapture
         timeout-minutes: 10
 
-      - name: Install cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.46.20
-        with:
-          tool: cargo-ci-cache-clean
-
       - name: CI cache clean
         run: cargo-ci-cache-clean
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,10 +26,15 @@ jobs:
         with:
           toolchain: ${{ matrix.version }}
 
+      - name: Install cargo-binstall,cargo-ci-cache-clean
+        uses: taiki-e/install-action@v2.46.20
+        with:
+          tool: cargo-binstall,cargo-ci-cache-clean
+
       - name: Install DB CLI tools
         run: |
-          cargo install sqlx-cli --no-default-features --features=rustls,sqlite
-          cargo install diesel_cli --no-default-features --features sqlite
+          cargo binstall sqlx-cli --no-default-features --features=rustls,sqlite
+          cargo binstall diesel_cli --no-default-features --features sqlite
 
       - name: Create Test DBs
         env:
@@ -63,10 +68,5 @@ jobs:
           cargo test -p=db-diesel --no-fail-fast -- --nocapture
         timeout-minutes: 10
 
-      - name: Install cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.46.20
-        with:
-          tool: cargo-ci-cache-clean
-
       - name: CI cache clean
         run: cargo-ci-cache-clean
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,7 @@
         "askama",
         "autoclean",
         "autoreload",
+        "binstall",
         "chrono",
         "deadpool",
         "dotenv",