From 4ed67330b559ea4a97d7a43a7a584d385e8a0c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Tue, 14 Feb 2023 12:23:58 +0100 Subject: [PATCH] ci: fix check-git-branches regex --- .github/workflows/check-git-branches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-git-branches.yml b/.github/workflows/check-git-branches.yml index d86bc9546c..316d00393a 100644 --- a/.github/workflows/check-git-branches.yml +++ b/.github/workflows/check-git-branches.yml @@ -17,7 +17,7 @@ jobs: fetch-depth: 0 - name: Set output variable to latest release branch id: step2 - run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+' | tail -n 1 | sed 's/ origin\///')" >> $GITHUB_OUTPUT + run: echo "latest_release=$(git branch -r | grep -E 'release/v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n 1)" >> $GITHUB_OUTPUT check-merge-master: name: Check that the release branch merges into master needs: get_release @@ -29,6 +29,6 @@ jobs: fetch-depth: 0 - name: Check merge master run: | - ./.github/workflows/support-files/git-merge-check.sh master $branch1 + ./.github/workflows/support-files/git-merge-check.sh origin/master $branch1 env: branch1: ${{needs.get_release.outputs.output1}}