From 1b0f9985da4db44b888b24a19589bc72dc7ab29f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 7 Aug 2024 23:38:51 +0200 Subject: [PATCH 1/6] workflow adjustments --- .github/workflows/electron.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index 7744002..97d9e27 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -1,11 +1,8 @@ -# name of your github action name: BuildnPub_WLGate -# this will help you specify where to run on: push: branches: - # this will run on the electron branch - - master + - mac_action workflow_dispatch: jobs: @@ -18,12 +15,10 @@ jobs: node-version: 21 - name: install dependencies run: npm install - - name: build - run: npm run make -- --platform linux --arch=x64 - - name: publish + - name: build and publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run publish --from-dry-run + run: npx electron-forge publish --platform linux --arch=x64 build_on_mac: runs-on: macos-14 @@ -42,12 +37,10 @@ jobs: npm install -g appdmg@0.6.6 - name: install dependencies run: npm install - - name: build - run: npm run make --arch=universal - - name: publish + - name: build and publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run publish --from-dry-run + run: npx electron-forge publish --arch=universal build_on_win: @@ -59,9 +52,7 @@ jobs: node-version: 21 - name: install dependencies run: npm install - - name: build - run: npm run make - - name: publish + - name: build and publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run publish --from-dry-run + run: npx electron-forge publish From c049578dc015454a257446cbaeeb532a23126641 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 7 Aug 2024 23:39:29 +0200 Subject: [PATCH 2/6] forge config --- forge.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge.config.js b/forge.config.js index 74210a7..dbc5c1b 100644 --- a/forge.config.js +++ b/forge.config.js @@ -10,7 +10,7 @@ module.exports = { name: '@electron-forge/publisher-github', config: { repository: { - owner: 'wavelog', + owner: 'HB9HIL', name: 'WaveLogGate' }, prerelease: false @@ -25,8 +25,9 @@ module.exports = { }, { name: '@electron-forge/maker-dmg', - config: { format: 'ULFO' }, + config: { format: 'UDZO' }, platforms: ['darwin'], + arch: ['universal'], }, { name: '@electron-forge/maker-deb', From e9c3b4a83666f73da59e7c2fdcc1c4ed50108237 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 7 Aug 2024 23:44:16 +0200 Subject: [PATCH 3/6] use the newer checkout version --- .github/workflows/electron.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index 97d9e27..82402ae 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -9,7 +9,7 @@ jobs: build_on_linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@master with: node-version: 21 @@ -23,7 +23,7 @@ jobs: build_on_mac: runs-on: macos-14 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@master with: node-version: 21 @@ -46,7 +46,7 @@ jobs: build_on_win: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@master with: node-version: 21 From bef7bb3955b9da5e5c5c139c47413296135a7cfa Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 7 Aug 2024 23:57:10 +0200 Subject: [PATCH 4/6] npm name pattern fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe82400..c77c358 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "WaveLog_Gate_by_DJ7NT", + "name": "wavelog-gate-by-dj7nt", "productName": "WaveLogGate", "description": "Gateway for connecting WSJT-* and FLRig to Wavelog", "keywords": [], From 26b67e18a74338dd80c8f00491d32e66f345f468 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 8 Aug 2024 00:07:08 +0200 Subject: [PATCH 5/6] run the workflow --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3565175..4a5a3ee 100644 --- a/README.md +++ b/README.md @@ -44,3 +44,4 @@ Enjoy #### Contributing Contribution is welcome. PRs will only be accepted against the Dev-Branch. + From 95378b76335c1f7965005be9dec3244439593fc4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 8 Aug 2024 00:14:41 +0200 Subject: [PATCH 6/6] set correct repo and branch --- .github/workflows/electron.yml | 2 +- forge.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index 82402ae..9ceeadc 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -2,7 +2,7 @@ name: BuildnPub_WLGate on: push: branches: - - mac_action + - master workflow_dispatch: jobs: diff --git a/forge.config.js b/forge.config.js index dbc5c1b..c485371 100644 --- a/forge.config.js +++ b/forge.config.js @@ -10,7 +10,7 @@ module.exports = { name: '@electron-forge/publisher-github', config: { repository: { - owner: 'HB9HIL', + owner: 'wavelog', name: 'WaveLogGate' }, prerelease: false