diff options
author | mhatvan <markus_hatvan@aon.at> | 2021-08-13 09:18:12 +0200 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-08-13 08:45:28 +0000 |
commit | 7be149708df87475a06ba7b722817fc9f0990998 (patch) | |
tree | 3b659615b9acf1495d743aaf61fb523a446b3f3b | |
parent | fix(App): Fix app focus detection (diff) | |
download | ferdium-app-7be149708df87475a06ba7b722817fc9f0990998.tar.gz ferdium-app-7be149708df87475a06ba7b722817fc9f0990998.tar.zst ferdium-app-7be149708df87475a06ba7b722817fc9f0990998.zip |
build: fix beta channel release for snap
- moved PACKAGE_VERSION fetching lower in github CI workflow
- distinguish naming between beta and stable publish steps
- publish snap to snapstore AND github
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 8 | ||||
-rw-r--r-- | electron-builder.yml | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index d9627c816..885d3e656 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -190,7 +190,6 @@ jobs: | |||
190 | echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV | 190 | echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV |
191 | echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV | 191 | echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV |
192 | echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'getferdi') }}" >> $GITHUB_ENV | 192 | echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'getferdi') }}" >> $GITHUB_ENV |
193 | echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV | ||
194 | - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch | 193 | - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch |
195 | uses: actions/checkout@v2 | 194 | uses: actions/checkout@v2 |
196 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} | 195 | if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }} |
@@ -242,6 +241,9 @@ jobs: | |||
242 | run: npm cache clean --force | 241 | run: npm cache clean --force |
243 | - name: Install node dependencies recursively | 242 | - name: Install node dependencies recursively |
244 | run: npx lerna bootstrap | 243 | run: npx lerna bootstrap |
244 | - name: Figure out used package.json version | ||
245 | run: echo "PACKAGE_VERSION=$(node -p 'require("./package.json").version')" >> $GITHUB_ENV | ||
246 | shell: bash | ||
245 | - name: Package recipes | 247 | - name: Package recipes |
246 | run: npm i && npm run package | 248 | run: npm i && npm run package |
247 | working-directory: ./recipes | 249 | working-directory: ./recipes |
@@ -263,7 +265,7 @@ jobs: | |||
263 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies | 265 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies |
264 | snapcraft logout | 266 | snapcraft logout |
265 | shell: bash | 267 | shell: bash |
266 | - name: Build Ferdi with publish for 'release' branch | 268 | - name: Build Ferdi with publish for 'release' beta branch |
267 | if: ${{ env.GIT_BRANCH_NAME == 'release' && contains(env.PACKAGE_VERSION, 'beta') }} | 269 | if: ${{ env.GIT_BRANCH_NAME == 'release' && contains(env.PACKAGE_VERSION, 'beta') }} |
268 | env: | 270 | env: |
269 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} | 271 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} |
@@ -275,7 +277,7 @@ jobs: | |||
275 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=ferdi -c.snap.publish.channels=beta | 277 | npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=ferdi -c.snap.publish.channels=beta |
276 | snapcraft logout | 278 | snapcraft logout |
277 | shell: bash | 279 | shell: bash |
278 | - name: Build Ferdi with publish for 'release' branch | 280 | - name: Build Ferdi with publish for 'release' stable branch |
279 | if: ${{ env.GIT_BRANCH_NAME == 'release' && !contains(env.PACKAGE_VERSION, 'beta') }} | 281 | if: ${{ env.GIT_BRANCH_NAME == 'release' && !contains(env.PACKAGE_VERSION, 'beta') }} |
280 | env: | 282 | env: |
281 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} | 283 | GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }} |
diff --git a/electron-builder.yml b/electron-builder.yml index bf3b25ac1..e8cb0f4f5 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -63,7 +63,8 @@ linux: | |||
63 | 63 | ||
64 | snap: | 64 | snap: |
65 | publish: | 65 | publish: |
66 | provider: "snapStore" | 66 | - snapStore |
67 | - github | ||
67 | 68 | ||
68 | nsis: | 69 | nsis: |
69 | perMachine: false | 70 | perMachine: false |