From 066c3ae8fae8375256f8e6339e8213df4d083e9a Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 8 May 2024 12:52:18 +0200 Subject: [PATCH] Try to get build to work for bellissima branch too (cherry picked from commit b27785fccba9baa72d1594fc9e7f5c58c4c6bad4) --- .github/workflows/ci.yml | 4 +++- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a944a08..2edb6ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,11 @@ on: push: branches: - main + - bellissima pull_request: branches: - - main + - main + - bellissima jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f42f57a..ea9cc39 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Verify commit exists in origin/main + - name: Verify commit exists in origin/main or origin/bellissima run: | git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* - git branch --remote --contains | grep origin/main + git branch --remote --contains | grep 'origin/main|origin/bellissima' - name: Set VERSION variable from tag run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV - name: Build