diff options
| author |  Vijay A <avijayr@protonmail.com> | 2021-07-01 12:24:54 +0530 |
|---|---|---|
| committer | Vijay A <avijayr@protonmail.com> | 2021-07-01 12:24:54 +0530 |
| commit | 243df375803f34d56f60eb2c682bb2af4a0961af (patch) | |
| tree | dd1ab94f9b6b4b49419b321c870fa88a1bd2b175 /.github | |
| parent | Fixed issue with hard-coded branch name in the 'git push' command. [skip ci] (diff) | |
| download | ferdium-app-243df375803f34d56f60eb2c682bb2af4a0961af.tar.gz ferdium-app-243df375803f34d56f60eb2c682bb2af4a0961af.tar.zst ferdium-app-243df375803f34d56f60eb2c682bb2af4a0961af.zip | |
Fixed issue with hard-coded branch name in the 'git push' command. [skip ci]
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ferdi-builds.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 399b3c7ea..c2c253011 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
| @@ -60,15 +60,14 @@ jobs: | |||
| 60 | if [ $CHANGES_COUNT -eq 0 ] && [ $MANUAL_REBUILD != "true" ]; then | 60 | if [ $CHANGES_COUNT -eq 0 ] && [ $MANUAL_REBUILD != "true" ]; then |
| 61 | echo "No changes found - terminating the build" | 61 | echo "No changes found - terminating the build" |
| 62 | echo "::set-output name=should_run::false" | 62 | echo "::set-output name=should_run::false" |
| 63 | else | 63 | else # changes > 0 (or) MANUAL_REBUILD=true |
| 64 | # changes > 0 (or) MANUAL_REBUILD=true | ||
| 65 | if [ $MANUAL_REBUILD != "true" ] || [ "${{ contains(github.event.inputs.message, 'version bump') }}" == "true" ]; then | 64 | if [ $MANUAL_REBUILD != "true" ] || [ "${{ contains(github.event.inputs.message, 'version bump') }}" == "true" ]; then |
| 66 | echo "Bumping version number" | 65 | echo "Bumping version number" |
| 67 | npm version prerelease --preid=nightly | 66 | npm version prerelease --preid=nightly |
| 68 | fi | 67 | fi |
| 69 | 68 | ||
| 70 | echo "Pushing merge, linter, submodule and version-bump commits" | 69 | echo "Pushing merge and version-bump commits" |
| 71 | git push origin nightly --no-verify | 70 | git push origin $(git rev-parse --abbrev-ref HEAD) --no-verify |
| 72 | fi | 71 | fi |
| 73 | 72 | ||
| 74 | build_mac: | 73 | build_mac: |