Skip to content

Commit

Permalink
Merge branch 'master' into improve-baseupdater-error-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaietta authored Feb 3, 2025
2 parents 6f72067 + 14ee2d6 commit f76e1a1
Show file tree
Hide file tree
Showing 17 changed files with 151 additions and 668 deletions.
5 changes: 5 additions & 0 deletions .changeset/fresh-phones-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"app-builder-lib": patch
---

feat: Allow users to pass a custom electrons headers URL via env var
5 changes: 5 additions & 0 deletions .changeset/fuzzy-trains-grab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"electron-updater": minor
---

feat: add `isUpdateAvailable` property to `checkForUpdates` result
5 changes: 5 additions & 0 deletions .changeset/weak-owls-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"app-builder-lib": patch
---

fix: handle yarn berry patch format in electron-updater version check
9 changes: 6 additions & 3 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ issue_labeler_regex_version=0

<!-- Which version of electron-builder are you using? -->
<!-- Please always try to use latest version before reporting any issue. -->
* **Electron-Builder Version**:
* **Electron-Builder Version**:

<!-- Which version of node are you using? -->
* **Node Version**:
* **Node Version**:

<!-- Which version of electron are you using? -->
<!-- Please verify if the error is electron related before reporting any issues. -->
Expand All @@ -16,6 +16,9 @@ issue_labeler_regex_version=0
<!-- Which version of electron-updater are you using (if applicable)? -->

<!-- For which target are you building for? -->
* **Target**:
* **Target**:

<!-- Provide excerpt of build logs with env var `DEBUG=electron-builder` set -->
* **Debug Logs**:

<!-- Enter your issue details below this comment. -->
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ jobs:
testFiles:
- ArtifactPublisherTest,BuildTest,ExtraBuildTest,RepoSlugTest,binDownloadTest,configurationValidationTest,filenameUtilTest,filesTest,globTest,ignoreTest,macroExpanderTest,mainEntryTest,urlUtilTest,extraMetadataTest,linuxArchiveTest,linuxPackagerTest,HoistedNodeModuleTest,MemoLazyTest
- snapTest,debTest,fpmTest,protonTest
- winPackagerTest,BuildTest,winCodeSignTest
- installerTest
- winPackagerTest,BuildTest,winCodeSignTest,webInstallerTest
- oneClickInstallerTest,assistedInstallerTest
steps:
- name: Checkout code repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down Expand Up @@ -196,9 +196,9 @@ jobs:
fail-fast: false
matrix:
testFiles:
- installerTest
- winPackagerTest,winCodeSignTest
- masTest,dmgTest,filesTest,macPackagerTest,differentialUpdateTest
- oneClickInstallerTest,assistedInstallerTest
- winPackagerTest,winCodeSignTest,webInstallerTest
- masTest,dmgTest,filesTest,macPackagerTest,differentialUpdateTest,macArchiveTest
steps:
- name: Checkout code repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down
27 changes: 18 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,23 @@ our git [commit messages can be formatted](https://gist.github.com/develar/273e2

## Documentation

Documentation files located in the `/docs`.
Documentation files located in the `/pages`.

`/docs` is deployed to Netlify on every release and available for all users.

`bash netlify-docs.sh` to setup local env (Python 3) and build.

Build command: `mkdocs build`.
Build commands:
```
pnpm docs:prebuild # docker image
pnpm docs:prebuild
pnpm docs:mkdocs
pnpm docs:preview # (optional) open in browser
```

## Debug Tests

Only IntelliJ Platform IDEs ([IntelliJ IDEA](https://confluence.jetbrains.com/display/IDEADEV/IDEA+2017.1+EAP),
### IntelliJ

IntelliJ Platform IDEs ([IntelliJ IDEA](https://confluence.jetbrains.com/display/IDEADEV/IDEA+2017.1+EAP),
[WebStorm](https://confluence.jetbrains.com/display/WI/WebStorm+EAP)) support debug.

If you use IntelliJ IDEA or WebStorm — [ij-rc-producer](https://github.com/develar/ij-rc-producer) is used and you
Expand All @@ -137,15 +143,18 @@ Or you can create the Node.js run configuration manually:
uses temporary directory (only if `--match` is used). Specified directory will be used instead of random
temporary directory and _cleared_ on each run.

### VSCode

Config is committed to the repo, it should auto-setup. Just make sure to run `pnpm compile` first (or `pnpm compile --watch` in a separate terminal)

### Run Test using CLI

```sh
pnpm compile
TEST_APP_TMP_DIR=/tmp/electron-builder-test ./node_modules/.bin/jest --env jest-environment-node-debug -t 'assisted' '/oneClickInstallerTest\.\w+$'
TEST_APP_TMP_DIR=/tmp/electron-builder-test TEST_FILES=oneClickInstallerTest,assistedInstallerTest,webInstallerTest pnpm ci:test'
```
where `TEST_APP_TMP_DIR` is specified to easily inspect and use test build, `assisted` is the test name
and `/oneClickInstallerTest\.\w+$` is the path to test file.
where `TEST_APP_TMP_DIR` is specified to easily inspect and use test build, `oneClickInstallerTest` is the test filename
## Issues
Expand All @@ -158,4 +167,4 @@ This includes:
- log of the terminal output
- node version
- npm version
- on which system do you want to create installers (macOS, Linux or Windows).
- electron-builder config
16 changes: 0 additions & 16 deletions Pipfile

This file was deleted.

Loading

0 comments on commit f76e1a1

Please sign in to comment.