Commit 83d4c9d2 authored by Silvan Mosberger's avatar Silvan Mosberger
Browse files

workflows: Condition all merge-dependent workflows on a merge commit 

After the introduction of the reusable get-merge-commit.yml workflow,
this now applies it on all remaining workflows that depend on a merge
commit. This ensures that CI doesn't fail for those PRs, which would
cause notifications to be sent, and the CI run to be marked as failed in
the list of runs.
parent 2e261ac6

.github/workflows/check-nix-format.yml

+6 −2
Original line number Diff line number Diff line
@@ -13,15 +13,19 @@ permissions: 
  contents: read



jobs:

  get-merge-commit:

    uses: ./.github/workflows/get-merge-commit.yml



  nixos:

    name: nixfmt-check

    runs-on: ubuntu-latest

    if: "!contains(github.event.pull_request.title, '[skip treewide]')"

    needs: get-merge-commit

    if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')"

    steps:

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

        with:

          # pull_request_target checks out the base branch by default

          ref: refs/pull/${{ github.event.pull_request.number }}/merge

          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

          # Fetches the merge commit and its parents

          fetch-depth: 2

      - name: Checking out base branch

.github/workflows/codeowners-v2.yml

+6 −1
Original line number Diff line number Diff line
@@ -33,10 +33,15 @@ env: 
  DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}



jobs:

  get-merge-commit:

    uses: ./.github/workflows/get-merge-commit.yml



  # Check that code owners is valid

  check:

    name: Check

    runs-on: ubuntu-latest

    needs: get-merge-commit

    if: needs.get-merge-commit.outputs.mergedSha

    steps:

    - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
@@ -65,7 +70,7 @@ jobs: 


    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      with:

        ref: refs/pull/${{ github.event.number }}/merge

        ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

        path: pr



    - name: Validate codeowners

.github/workflows/editorconfig-v2.yml

+6 −2
Original line number Diff line number Diff line
@@ -11,10 +11,14 @@ on: 
      - 'release-**'



jobs:

  get-merge-commit:

    uses: ./.github/workflows/get-merge-commit.yml



  tests:

    name: editorconfig-check

    runs-on: ubuntu-latest

    if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"

    needs: get-merge-commit

    if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"

    steps:

    - name: Get list of changed files from PR

      env:
@@ -30,7 +34,7 @@ jobs: 
    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      with:

        # pull_request_target checks out the base branch by default

        ref: refs/pull/${{ github.event.pull_request.number }}/merge

        ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

    - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

      with:

        # nixpkgs commit is pinned so that it doesn't break

.github/workflows/nix-parse-v2.yml

+6 −2
Original line number Diff line number Diff line
@@ -11,10 +11,14 @@ on: 
      - 'release-**'



jobs:

  get-merge-commit:

    uses: ./.github/workflows/get-merge-commit.yml



  tests:

    name: nix-files-parseable-check

    runs-on: ubuntu-latest

    if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"

    needs: get-merge-commit

    if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"

    steps:

    - name: Get list of changed files from PR

      env:
@@ -30,7 +34,7 @@ jobs: 
    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      with:

        # pull_request_target checks out the base branch by default

        ref: refs/pull/${{ github.event.pull_request.number }}/merge

        ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

      if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}

    - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

      with: