diff options
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 5bc20ff23..a3faf4ca6 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -54,7 +54,9 @@ jobs: | |||
54 | git config user.email github-actions@github.com | 54 | git config user.email github-actions@github.com |
55 | 55 | ||
56 | CHANGES_COUNT=$(git diff --shortstat origin/develop | wc -l) | 56 | CHANGES_COUNT=$(git diff --shortstat origin/develop | wc -l) |
57 | if [ $CHANGES_COUNT -gt 0 ] || [ {{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[version bump]') }} ]; then | 57 | MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" |
58 | VERSION_BUMP="${{ contains(github.event.inputs.message, '[version bump]') }}" | ||
59 | if [ $CHANGES_COUNT -gt 0 ] || [ $MANUAL_REBUILD == "true" && $VERSION_BUMP == "true" ]; then | ||
58 | # Do the version bump in the 'develop' branch ONLY if there were other changes coming from the 'develop' branch | 60 | # Do the version bump in the 'develop' branch ONLY if there were other changes coming from the 'develop' branch |
59 | git checkout develop | 61 | git checkout develop |
60 | npm version -m "%s [skip ci]" prerelease --preid=nightly | 62 | npm version -m "%s [skip ci]" prerelease --preid=nightly |
@@ -66,7 +68,6 @@ jobs: | |||
66 | echo "Merge with fast-forward from 'origin/develop'" | 68 | echo "Merge with fast-forward from 'origin/develop'" |
67 | git merge --ff-only origin/develop --no-verify | 69 | git merge --ff-only origin/develop --no-verify |
68 | 70 | ||
69 | MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" | ||
70 | echo "Number of changes: $CHANGES_COUNT" | 71 | echo "Number of changes: $CHANGES_COUNT" |
71 | if [ $CHANGES_COUNT -eq 0 ] && [ $MANUAL_REBUILD != "true" ]; then | 72 | if [ $CHANGES_COUNT -eq 0 ] && [ $MANUAL_REBUILD != "true" ]; then |
72 | echo "No changes found - terminating the build" | 73 | echo "No changes found - terminating the build" |