Skip to content

Commit

Permalink
ci: try combining push and pr jobs without dupes (!)
Browse files Browse the repository at this point in the history
  • Loading branch information
ErichDonGubler committed May 11, 2024
1 parent 30e61d7 commit 062b2b9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/push.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
name: CI (push)

on: [push]
name: CI

on: [push, pull_request]
jobs:

block-autosquash-commits:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Block merging fixup commits
uses: ErichDonGubler/block-fixup-merge-action@patch-1

check:
name: Check
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -29,6 +38,7 @@ jobs:

test:
name: Test Suite
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -53,6 +63,7 @@ jobs:

fmt:
name: Rustfmt
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -77,6 +88,7 @@ jobs:

clippy:
name: Clippy
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -102,6 +114,7 @@ jobs:

rustdoc:
name: Documentation
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -128,6 +141,7 @@ jobs:
args: --all-features --no-deps

cargo-deny:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/pr.yml

This file was deleted.

0 comments on commit 062b2b9

Please sign in to comment.