diff options
author | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-07-06 19:00:11 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-06 19:00:11 +0530 |
commit | 4d489281242c68e3dbfae97db2d9a835fb1e5ce0 (patch) | |
tree | 83168ae889af9d6c742a966e0dcb780cf6cfbdd1 /.github/workflows/ferdi-builds.yml | |
parent | Added new help text for lay-users to figure out what their user-agent value is. (diff) | |
download | ferdium-app-4d489281242c68e3dbfae97db2d9a835fb1e5ce0.tar.gz ferdium-app-4d489281242c68e3dbfae97db2d9a835fb1e5ce0.tar.zst ferdium-app-4d489281242c68e3dbfae97db2d9a835fb1e5ce0.zip |
Separated version number bump into the 'develop' branch from 'nightly' branch (#1610)
* Separated version number bump into the 'develop' branch so that the commit SHA appearing in 'About' will remain unchanged
Diffstat (limited to '.github/workflows/ferdi-builds.yml')
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index c2c253011..78c47f74e 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -5,8 +5,10 @@ | |||
5 | # 'FERDI_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts) | 5 | # 'FERDI_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts) |
6 | # 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts) | 6 | # 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts) |
7 | # 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts) | 7 | # 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts) |
8 | # 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac and windows artifacts) | 8 | # 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts) |
9 | # 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac and windows artifacts) | 9 | # 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts) |
10 | # 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts) | ||
11 | # 'WIN_CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of windows artifacts) | ||
10 | 12 | ||
11 | name: Ferdi Builds | 13 | name: Ferdi Builds |
12 | 14 | ||
@@ -51,8 +53,8 @@ jobs: | |||
51 | git config user.name github-actions | 53 | git config user.name github-actions |
52 | git config user.email github-actions@github.com | 54 | git config user.email github-actions@github.com |
53 | 55 | ||
54 | echo "Merge from 'origin/develop'" | 56 | echo "Merge with fast-forward from 'origin/develop'" |
55 | git merge --no-ff --no-verify --commit -m "Merge remote-tracking branch 'origin/develop' into HEAD" origin/develop | 57 | git merge --ff-only origin/develop --no-verify |
56 | 58 | ||
57 | CHANGES_COUNT=$(git diff --shortstat origin/nightly | wc -l) | 59 | CHANGES_COUNT=$(git diff --shortstat origin/nightly | wc -l) |
58 | MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" | 60 | MANUAL_REBUILD="${{ github.event_name == 'workflow_dispatch' }}" |
@@ -61,12 +63,7 @@ jobs: | |||
61 | echo "No changes found - terminating the build" | 63 | echo "No changes found - terminating the build" |
62 | echo "::set-output name=should_run::false" | 64 | echo "::set-output name=should_run::false" |
63 | else # changes > 0 (or) MANUAL_REBUILD=true | 65 | else # changes > 0 (or) MANUAL_REBUILD=true |
64 | if [ $MANUAL_REBUILD != "true" ] || [ "${{ contains(github.event.inputs.message, 'version bump') }}" == "true" ]; then | 66 | echo "Pushing rebased commits" |
65 | echo "Bumping version number" | ||
66 | npm version prerelease --preid=nightly | ||
67 | fi | ||
68 | |||
69 | echo "Pushing merge and version-bump commits" | ||
70 | git push origin $(git rev-parse --abbrev-ref HEAD) --no-verify | 67 | git push origin $(git rev-parse --abbrev-ref HEAD) --no-verify |
71 | fi | 68 | fi |
72 | 69 | ||