Skip to content

Commit

Permalink
disable merge queue (#220)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
TroyKomodo authored Dec 8, 2024
1 parent 58bcdee commit e86f8b3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 28 deletions.
30 changes: 3 additions & 27 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -49,18 +30,17 @@ 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

fmt:
name: Fmt
runs-on: ubuntu-24.04
needs: pre-job
if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
permissions:
checks: write
steps:
Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/gh-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ on:

jobs:
cleanup:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
actions: write
steps:
- name: Cleanup
run: |
Expand Down

0 comments on commit e86f8b3

Please sign in to comment.