Skip to content

Commit 789153e

Browse files
committed
Merge branch 't/rework-workflows' of gregorydlogan/opencast-admin-interface into r/17.x
Pull request #1473 Fix release related github actions scripts
2 parents b197917 + 203e1c9 commit 789153e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/release-cut-tag.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
GH_TOKEN: ${{ github.token }}
2424
run: |
2525
#Translate 'develop' to 18.x or whatever is appropriate
26-
if [ "develop" == "${{ github.ref_name }}" ]; then
26+
if [ "develop" = "${{ github.ref_name }}" ]; then
2727
#NB normally we only clone just the head ref, but fetch-depth: 0 above gets *all* the history
28-
export TEMP="$((`git branch -a | grep r/ | cut -f 4 -d '/' | cut -f 1 -d '.'` + 1)).x"
28+
export TEMP="$((`git branch -a | grep r/ | cut -f 4 -d '/' | sort | tail -n 1 | cut -f 1 -d '.'` + 1)).x"
2929
else
3030
export TEMP=${{ github.ref_name }}
3131
fi
3232
export TAG=${TEMP#r\/}-`date +%Y-%m-%d`
3333
git tag $TAG
3434
git push origin $TAG
3535
sleep 2
36-
gh workflow run process-release.yml -r $TAG
36+
gh workflow run release-build.yml -r $TAG

0 commit comments

Comments
 (0)