Remove remaining GitHub actions FIXMEs.

azriel91 · Jun 27, 2023 · 6eed661 · 6eed661
1 parent ec5c34e
commit 6eed661
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,11 +59,7 @@ jobs:
           toolchain: nightly
           components: clippy
 
-      - # FIXME: Switch back when actions-rs/cargo#217 gets merged
-        uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
-        with:
-          command: clippy
-          args: --workspace --all-features -- -D warnings
+      - run: cargo clippy --workspace --all-features -- -D warnings
 
   coverage:
     name: Coverage

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -63,34 +63,25 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: workspaces Cache
-        id: workspaces_cache
+      - name: cargo-release Cache
+        id: cargo_release_cache
         uses: actions/cache@v3
         with:
-          path: ~/.cargo/bin/cargo-workspaces
-          key: ${{ runner.os }}-cargo-workspaces
+          path: ~/.cargo/bin/cargo-release
+          key: ${{ runner.os }}-cargo-release
 
-      - # FIXME: Switch back when actions-rs/cargo#217 gets merged
-        uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
-        if: steps.workspaces_cache.outputs.cache-hit != 'true'
-        with:
-          command: install
-          args: cargo-workspaces
+      - run: cargo install cargo-release
+        if: steps.cargo_release_cache.outputs.cache-hit != 'true'
 
       - name: cargo login
-        # FIXME: Switch back when actions-rs/cargo#217 gets merged
-        uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
-        with:
-          command: login
-          args: ${{ secrets.CRATES_IO_API_TOKEN }}
-
-      - # FIXME: Switch back when actions-rs/cargo#217 gets merged
-        uses: r3-os/actions-rust-cargo@fb222fe18dc90e381546d012f9e3d6f353f0f627
-        with:
-          command: workspaces
-          args: >
-            publish
-            --from-git
-            --allow-branch main
-            --force '*'
-            --no-git-tag
+        run: cargo login ${{ secrets.CRATES_IO_API_TOKEN }}
+
+      - name: "cargo release publish"
+        run: |-
+          cargo release \
+            publish \
+            --workspace \
+            --all-features \
+            --allow-branch HEAD \
+            --no-confirm \
+            --execute