workflows/periodic-merge: move fork condition to calling workflow
Apparently the skipping needs to happen on the calling workflow, otherwise those workflows show up as "failed" in forks instead of skipped.
This commit is contained in:
1
.github/workflows/periodic-merge-24h.yml
vendored
1
.github/workflows/periodic-merge-24h.yml
vendored
@@ -20,6 +20,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
periodic-merge:
|
periodic-merge:
|
||||||
|
if: github.repository_owner == 'NixOS'
|
||||||
strategy:
|
strategy:
|
||||||
# don't fail fast, so that all pairs are tried
|
# don't fail fast, so that all pairs are tried
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|||||||
1
.github/workflows/periodic-merge-6h.yml
vendored
1
.github/workflows/periodic-merge-6h.yml
vendored
@@ -20,6 +20,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
periodic-merge:
|
periodic-merge:
|
||||||
|
if: github.repository_owner == 'NixOS'
|
||||||
strategy:
|
strategy:
|
||||||
# don't fail fast, so that all pairs are tried
|
# don't fail fast, so that all pairs are tried
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|||||||
1
.github/workflows/periodic-merge.yml
vendored
1
.github/workflows/periodic-merge.yml
vendored
@@ -14,7 +14,6 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
merge:
|
merge:
|
||||||
if: github.repository_owner == 'NixOS'
|
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
name: ${{ inputs.from }} → ${{ inputs.into }}
|
name: ${{ inputs.from }} → ${{ inputs.into }}
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
Reference in New Issue
Block a user