Unverified Commit 8e109363 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Consistently condition merge-dependent workflows (#364338)

parents f7d7b986 4e6b5639

.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/eval-lib-tests.yml

+1 −1
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ jobs: 
    name: nixpkgs-lib-tests

    runs-on: ubuntu-latest

    needs: get-merge-commit

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

    steps:

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

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

        with:

          # pull_request_target checks out the base branch by default

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

.github/workflows/eval.yml

+9 −16
Original line number Diff line number Diff line
@@ -23,22 +23,21 @@ jobs: 
    name: Attributes

    runs-on: ubuntu-latest

    needs: get-merge-commit

    # Skip this and dependent steps if the PR can't be merged

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

    outputs:

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

      baseSha: ${{ steps.baseSha.outputs.baseSha }}

      systems: ${{ steps.systems.outputs.systems }}

    steps:

      - name: Check out the PR at the test merge commit

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

        # Add this to _all_ subsequent steps to skip them

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

        with:

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

          fetch-depth: 2

          path: nixpkgs



      - name: Determine base commit

        if: github.event_name == 'pull_request_target' && needs.get-merge-commit.outputs.mergedSha

        if: github.event_name == 'pull_request_target'

        id: baseSha

        run: |

          baseSha=$(git -C nixpkgs rev-parse HEAD^1)
@@ -46,18 +45,15 @@ jobs: 


      - name: Install Nix

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

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



      - name: Evaluate the list of all attributes and get the systems matrix

        id: systems

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

        run: |

          nix-build nixpkgs/ci -A eval.attrpathsSuperset

          echo "systems=$(<result/systems.json)" >> "$GITHUB_OUTPUT"



      - name: Upload the list of all attributes

        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

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

        with:

          name: paths

          path: result/*
@@ -65,12 +61,12 @@ jobs: 
  eval-aliases:

    name: Eval nixpkgs with aliases enabled

    runs-on: ubuntu-latest

    needs: attrs

    needs: [ attrs, get-merge-commit ]

    steps:

      - name: Check out the PR at the test merge commit

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

        with:

          ref: ${{ needs.attrs.outputs.mergedSha }}

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

          path: nixpkgs



      - name: Install Nix
@@ -83,9 +79,7 @@ jobs: 
  outpaths:

    name: Outpaths

    runs-on: ubuntu-latest

    needs: attrs

    # Skip this and future steps if the PR can't be merged

    if: needs.attrs.outputs.mergedSha

    needs: [ attrs, get-merge-commit ]

    strategy:

      matrix:

        system: ${{ fromJSON(needs.attrs.outputs.systems) }}
@@ -99,7 +93,7 @@ jobs: 
      - name: Check out the PR at the test merge commit

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

        with:

          ref: ${{ needs.attrs.outputs.mergedSha }}

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

          path: nixpkgs



      - name: Install Nix
@@ -117,7 +111,6 @@ jobs: 


      - name: Upload the output paths and eval stats

        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

        if: needs.attrs.outputs.mergedSha

        with:

          name: intermediate-${{ matrix.system }}

          path: result/*
@@ -125,7 +118,7 @@ jobs: 
  process:

    name: Process

    runs-on: ubuntu-latest

    needs: [ outpaths, attrs ]

    needs: [ outpaths, attrs, get-merge-commit ]

    outputs:

      baseRunId: ${{ steps.baseRunId.outputs.baseRunId }}

    steps:
@@ -138,7 +131,7 @@ jobs: 
      - name: Check out the PR at the test merge commit

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

        with:

          ref: ${{ needs.attrs.outputs.mergedSha }}

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

          path: nixpkgs



      - name: Install Nix