From 228b85715f27993b41fa012b736d5a8b4d5f139c Mon Sep 17 00:00:00 2001 From: Pat Date: Wed, 24 Jan 2024 10:19:01 +0200 Subject: [PATCH] workflows: update for new 2.2 branch/3.x master (#8414) * workflows: update for new 2.2 branch/3.x master Signed-off-by: Patrick Stephens * workflows: update for new container tags Signed-off-by: Patrick Stephens --------- Signed-off-by: Patrick Stephens --- .github/workflows/cron-unstable-build.yaml | 11 +++++++++-- .github/workflows/staging-release.yaml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cron-unstable-build.yaml b/.github/workflows/cron-unstable-build.yaml index ed43e90b4be..7e8f69666d9 100644 --- a/.github/workflows/cron-unstable-build.yaml +++ b/.github/workflows/cron-unstable-build.yaml @@ -13,7 +13,8 @@ on: # Run nightly build at this time, bit of trial and error but this seems good. schedule: - cron: "0 6 * * *" # master build - - cron: "0 12 * * *" # 2.1 build + - cron: "0 12 * * *" # 2.2 build + - cron: "0 18 * * *" # 2.1 build # We do not want a new unstable build to run whilst we are releasing the current unstable build. concurrency: unstable-build-release @@ -51,8 +52,14 @@ jobs: echo "cron_branch=master" >> $GITHUB_ENV shell: bash - - name: 2.1 run + - name: 2.2 run if: github.event_name == 'schedule' && github.event.schedule=='0 12 * * *' + run: | + echo "cron_branch=2.2" >> $GITHUB_ENV + shell: bash + + - name: 2.1 run + if: github.event_name == 'schedule' && github.event.schedule=='0 18 * * *' run: | echo "cron_branch=2.1" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/staging-release.yaml b/.github/workflows/staging-release.yaml index 44dc75be236..daed8eb07a4 100644 --- a/.github/workflows/staging-release.yaml +++ b/.github/workflows/staging-release.yaml @@ -435,7 +435,7 @@ jobs: shell: bash - name: Promote container images from staging to GHCR.io - if: ${{ startsWith(github.event.inputs.version, '2.0') || startsWith(github.event.inputs.version, '2.1') || ! startsWith(matrix.tag, 'latest') }} + if: ${{ startsWith(github.event.inputs.version, '2.') || startsWith(github.event.inputs.version, '3.') || ! startsWith(matrix.tag, 'latest') }} run: | docker run --rm \ quay.io/skopeo/stable:latest \