Skip to content

Commit f97342b

Browse files
committed
restore original config
1 parent a805c43 commit f97342b

2 files changed

Lines changed: 9 additions & 20 deletions

File tree

.github/workflows/release.desktop.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ jobs:
1616
-
1717
uses: actions/checkout@v4
1818
with:
19-
ref: master
20-
fetch-depth: 0
19+
ref: master # otherwise it defaults to the version tag missing bump commit
20+
fetch-depth: 0 # fetch all history
21+
-
22+
name: Checkout to bump commit
23+
shell: bash
24+
run: git checkout "$(git rev-list "${{ github.event.release.tag_name }}"..master | tail -1)"
2125
-
2226
name: Setup node
2327
uses: ./.github/actions/setup-node
@@ -31,13 +35,9 @@ jobs:
3135
name: Prebuild
3236
run: npm run electron:prebuild
3337
-
34-
name: Build
35-
run: npm run electron:build -- --publish never
36-
shell: bash
37-
-
38-
name: Publish to GitHub Release
38+
name: Build and publish
3939
run: npm run electron:build -- --publish always
40-
shell: bash
40+
shell: bash # Required for correct argument passing (--)
4141
env:
4242
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43-
EP_GH_IGNORE_TIME: true
43+
EP_GH_IGNORE_TIME: true # Otherwise publishing fails if GitHub release is more than 2 hours old https://github.com/electron-userland/electron-builder/issues/2074

electron-builder.cjs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ module.exports = {
1212
// Common options
1313
publish: {
1414
provider: 'github',
15-
owner: 'BlueCtx',
16-
repo: 'anonseclab-privacy',
1715
vPrefixedTagName: false, // default: true
1816
releaseType: 'release', // default: draft
1917
},
@@ -30,7 +28,6 @@ module.exports = {
3028
// Windows
3129
win: {
3230
target: 'nsis',
33-
icon: resolvePathFromProjectRoot('src/presentation/electron/build/icon.ico'),
3431
},
3532
nsis: {
3633
artifactName: '${name}-Setup-${version}.${ext}',
@@ -39,13 +36,6 @@ module.exports = {
3936
// Linux
4037
linux: {
4138
target: 'AppImage',
42-
icon: resolvePathFromProjectRoot('src/presentation/electron/build/icon.png'),
43-
category: 'Utility',
44-
executableName: 'anonseclab-privacy',
45-
desktop: {
46-
Icon: 'anonseclab-privacy',
47-
Name: 'AnonSecLab Privacy Tools',
48-
},
4939
},
5040
appImage: {
5141
artifactName: '${name}-${version}.${ext}',
@@ -57,7 +47,6 @@ module.exports = {
5747
target: 'dmg',
5848
arch: 'universal',
5949
},
60-
icon: resolvePathFromProjectRoot('src/presentation/electron/build/icon.png'),
6150
},
6251
dmg: {
6352
artifactName: '${name}-${version}.${ext}',

0 commit comments

Comments
 (0)