Merging upstream version 1.6.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.github/workflows/check.yml

@@ -28,7 +28,7 @@ jobs:
           override: true
           components: clippy, rustfmt
       - name: Check format
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all
       - name: Check fix
         run: cargo fix && cargo fix
       - name: Check with clippy
@@ -48,6 +48,7 @@ jobs:
   windows-vcpkg:
     name: windows-vcpkg
     runs-on: windows-latest
+    needs: [ build ]
     steps:
       - uses: actions/checkout@v3
       - uses: sfackler/actions/rustup@master
@@ -61,7 +62,7 @@ jobs:
           override: true
           components: clippy, rustfmt
       - name: Check format
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all
       - name: Check fix
         run: cargo fix && cargo fix
       - name: Check with clippy
@@ -77,3 +78,15 @@ jobs:
       - name: Build on nightly
         run: cargo build --release
 
+  publish-crate:
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    needs: [ windows-vcpkg ]
+    steps:
+      - name: Set up Rust
+        uses: hecrj/setup-rust-action@v2
+      - uses: actions/checkout@v4
+      - name: Publish
+        shell: bash
+        run: |
+          cargo publish --token ${{ secrets.CRATES_GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -1,24 +0,0 @@
-name: Deploy
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  # Publish starship to Crates.io
-  cargo_publish:
-    name: Publish Cargo Package
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup | Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup | Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-
-      - name: Build | Publish
-        run: cargo publish --token ${{ secrets.CRATES_GITHUB_TOKEN }}