Unverified Commit fc5c5812 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

workflows/periodic-merge: move fork condition to calling workflow (#373178)

parents acb7eed4 d725592c

.github/workflows/periodic-merge-24h.yml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ permissions: 


jobs:

  periodic-merge:

    if: github.repository_owner == 'NixOS'

    strategy:

      # don't fail fast, so that all pairs are tried

      fail-fast: false

.github/workflows/periodic-merge-6h.yml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ permissions: 


jobs:

  periodic-merge:

    if: github.repository_owner == 'NixOS'

    strategy:

      # don't fail fast, so that all pairs are tried

      fail-fast: false

.github/workflows/periodic-merge.yml

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ on: 


jobs:

  merge:

    if: github.repository_owner == 'NixOS'

    runs-on: ubuntu-24.04

    name: ${{ inputs.from }} → ${{ inputs.into }}

    steps: