diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-05 20:53:53 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-10-05 20:53:53 +0200 |
| commit | 8b77d991b6f478ccbd803870c7708a2266a85c38 (patch) | |
| tree | 16fab77a334aa57f4bba5689b1d3c8d67c47aafb /.github | |
| parent | 7cbed9e6bdf5020df3115098c8d3ace482a58ca4 (diff) | |
.github/workflows/periodic-merge: move stable merges to 24h cycle
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/periodic-merge-24h.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/periodic-merge-6h.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 81c5694f43d8..9032b3d7d910 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -28,6 +28,10 @@ jobs: pairs: - from: master into: haskell-updates + - from: release-21.05 + into: staging-next-21.05 + - from: staging-next-21.05 + into: staging-21.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 68fde857f888..daa9b6d3c844 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -30,10 +30,6 @@ jobs: into: staging-next - from: staging-next into: staging - - from: release-21.05 - into: staging-next-21.05 - - from: staging-next-21.05 - into: staging-21.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - uses: actions/checkout@v2 |