Skip to content

Commit e654c30

Browse files
authored
Merge branch 'master' into renovate/electron-universal-2.x
2 parents 9b7b8c7 + 0ce7b90 commit e654c30

File tree

7 files changed

+32
-6
lines changed

7 files changed

+32
-6
lines changed

.changeset/shaggy-teachers-relax.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"electron-updater": patch
3+
---
4+
5+
fix: allow forceDevUpdateConfig also on Linux

.changeset/yellow-icons-dream.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"app-builder-lib": patch
3+
---
4+
5+
fix(deps): update dependency @electron/osx-sign to v1.3.3

.github/actions/pretest/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
- name: Setup python
2424
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
2525
with:
26-
python-version: '3.11'
26+
python-version: '3.13'
2727

2828
- name: Setup node
2929
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4

.github/workflows/docker-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
docker save -o ${{ runner.temp }}/electron-builder-all-${{ env.NODE_TAG }}.tar electronuserland/builder
3535
3636
- name: Bundle all images
37-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
37+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
3838
with:
3939
name: electron-builder-all-${{ env.NODE_TAG }}
4040
path: ${{ runner.temp }}/electron-builder-all-${{ env.NODE_TAG }}.tar

packages/app-builder-lib/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@electron/asar": "3.4.1",
5151
"@electron/fuses": "^1.8.0",
5252
"@electron/notarize": "2.5.0",
53-
"@electron/osx-sign": "1.3.1",
53+
"@electron/osx-sign": "1.3.3",
5454
"@electron/rebuild": "3.7.2",
5555
"@electron/universal": "2.0.2",
5656
"@malept/flatpak-bundler": "^0.4.0",

packages/electron-updater/src/AppImageUpdater.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class AppImageUpdater extends BaseUpdater {
1616
}
1717

1818
public isUpdaterActive(): boolean {
19-
if (process.env["APPIMAGE"] == null) {
19+
if (process.env["APPIMAGE"] == null && !this.forceDevUpdateConfig) {
2020
if (process.env["SNAP"] == null) {
2121
this._logger.warn("APPIMAGE env is not defined, current application is not an AppImage")
2222
} else {

pnpm-lock.yaml

+18-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)