From 43a6fd70897e7b8d03d805fa1a66f6ca2e8da652 Mon Sep 17 00:00:00 2001 From: Jon Koops Date: Thu, 1 Dec 2022 13:07:17 +0100 Subject: [PATCH] Run CI on release branches (#3814) --- .github/workflows/cypress.yml | 6 +++--- .github/workflows/main.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 9427c98392..615ba3237b 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -1,9 +1,9 @@ name: Cypress on: push: - branches: [main] + branches: [main, release/**] pull_request: - branches: [main] + branches: [main, release/**] schedule: - cron: '0 4 * * *' workflow_dispatch: @@ -32,7 +32,7 @@ jobs: - name: Check out Keycloak Server uses: actions/checkout@v3 with: - repository: ${{ inputs.keycloakRepo || 'keycloak/keycloak' }} + repository: ${{ inputs.keycloakRepo || (contains(github.ref, 'release/') && github.ref || 'keycloak/keycloak') }} ref: ${{ inputs.keycloakBranch || 'main' }} path: keycloak-repo diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08beccfd64..c63c2eecb2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,9 @@ name: CI on: push: - branches: [main] + branches: [main, release/**] pull_request: - branches: [main] + branches: [main, release/**] concurrency: # Only cancel jobs for new commits on PRs, and always do a complete run on other branches (e.g. `main`). # See: https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value