From e86f8b3d8466da1e28764a6c5d91d859a79ba3e3 Mon Sep 17 00:00:00 2001
From: Troy <troybensonsa@gmail.com>
Date: Sun, 8 Dec 2024 01:59:21 -0500
Subject: [PATCH] disable merge queue (#220)

Currently the merge queue feature kinda sucks:
- You are unable to change the commit description
- Jobs run sometimes?

We should likely make our own at some point to run a 2nd stage of ci.
---
 .github/workflows/ci.yaml       | 30 +++---------------------------
 .github/workflows/gh-cache.yaml |  4 +++-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b93334c0..75695523 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,34 +7,15 @@ on:
 
   pull_request:
   workflow_dispatch:
-  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
-  pre-job:
-    runs-on: ubuntu-24.04
-    permissions:
-      actions: write
-      contents: read
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          concurrent_skipping: "never"
-          skip_after_successful_duplicate: "true"
-          paths_ignore: '["**/README.md", "**/docs/**"]'
-          do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
-
   clippy:
     name: Clippy
     runs-on: ubuntu-24.04
-    needs: pre-job
-    if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
     steps:
       - uses: actions/checkout@v4
 
@@ -49,9 +30,10 @@ jobs:
           components: clippy
 
       - uses: Swatinem/rust-cache@v2
+        id: cache-rust
         with:
           prefix-key: "v0-rust-${{ steps.setup-rust.outputs.cachekey }}"
-          key: clippy
+          shared-key: clippy
 
       - name: Make sure code is linted
         run: cargo +nightly xtask powerset clippy
@@ -59,8 +41,6 @@ jobs:
   fmt:
     name: Fmt
     runs-on: ubuntu-24.04
-    needs: pre-job
-    if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
     permissions:
       checks: write
     steps:
@@ -78,8 +58,6 @@ jobs:
   hakari:
     name: Hakari
     runs-on: ubuntu-24.04
-    needs: pre-job
-    if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
     steps:
       - uses: actions/checkout@v4
 
@@ -105,8 +83,6 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-24.04
-    needs: pre-job
-    if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
     steps:
       - uses: actions/checkout@v4
 
@@ -123,7 +99,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           prefix-key: "v0-rust-${{ steps.setup-rust.outputs.cachekey }}"
-          key: test
+          shared-key: test
 
       - uses: cargo-bins/cargo-binstall@main
 
diff --git a/.github/workflows/gh-cache.yaml b/.github/workflows/gh-cache.yaml
index 1d082437..2c1c1b2d 100644
--- a/.github/workflows/gh-cache.yaml
+++ b/.github/workflows/gh-cache.yaml
@@ -7,7 +7,9 @@ on:
 
 jobs:
   cleanup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    permissions:
+      actions: write
     steps:
       - name: Cleanup
         run: |