From 1c1b4403a95e6a651af84b49aff9a0ab46032cda Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Tue, 31 Mar 2026 01:52:30 -0400 Subject: [PATCH 1/4] test: use yarn instead of npx in cli spec (#4193) ts-node is in the workspace root devDependencies. --- packages/api/cli/spec/cli.slow.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/cli/spec/cli.slow.spec.ts b/packages/api/cli/spec/cli.slow.spec.ts index 0496bd5f11..4ff4383bcd 100644 --- a/packages/api/cli/spec/cli.slow.spec.ts +++ b/packages/api/cli/spec/cli.slow.spec.ts @@ -9,7 +9,7 @@ function runForgeCLI(...extraArgs: string[]): Promise { path.resolve(import.meta.dirname, '../src/electron-forge.ts'), ...extraArgs, ]; - return spawn('npx', args); + return spawn('yarn', args); } describe('cli', () => { From 2c4ae96051362dee7f111b6185676bc236927815 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 24 Mar 2026 01:08:03 -0700 Subject: [PATCH 2/4] ci: auto-label `next` PRs (#4187) * ci: auto-label `next` PRs * Update pull_request_target with comment for safety Added comment to ignore dangerous triggers in pull request events. --- .github/labeler.yml | 2 ++ .github/workflows/labeler.yml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000000..ad28327cf6 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,2 @@ +next: + - base-branch: 'next' diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 0000000000..15a6409caa --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,17 @@ +name: PR Labeler + +on: + pull_request_target: # zizmor: ignore[dangerous-triggers] + types: [opened, synchronize, reopened] + +permissions: + contents: read + pull-requests: write + +jobs: + label: + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1 + with: + sync-labels: true From c9ea8a36336422f508d5ae8019d9037075fbdc34 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Wed, 10 Dec 2025 19:13:20 -0800 Subject: [PATCH 3/4] docs: add `next` README notice (#4093) * docs: add `next` README notice Added important notice about upcoming feature development and pre-releases. * zzz --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index bf0fdf6cf8..4fa39c520f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,11 @@ [![license](https://img.shields.io/github/license/electron/forge.svg)](https://github.com/electron/forge/blob/main/LICENSE) ![status](https://img.shields.io/badge/Status-%20Ready%20for%20Awesome-red.svg) +> [!IMPORTANT] +> We're currently beginning feature development for the next major version of Electron Forge, which is being done in the [`next`](https://github.com/electron/forge/tree/next) branch. +> To try out experimental pre-releases, install the `@alpha` dist-tag of the `@electron-forge/*` packages via npm. +> For more details, see issue https://github.com/electron/forge/issues/4082. + A complete tool for building modern Electron applications. Electron Forge unifies the existing (and well maintained) build tools for From c10cb130c40cb1bf6db8c932115a23b1393a4554 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 7 Apr 2026 21:27:58 -0700 Subject: [PATCH 4/4] ci: update actions to latest --- .github/workflows/add-to-project.yml | 4 ++-- .github/workflows/gh-pages.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 1b472d931e..5879ad3efb 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -15,13 +15,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Generate GitHub App token - uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1 + uses: electron/github-app-auth-action@e14e47722ed120360649d0789e25b9baece12725 # v2.0.0 id: generate-token with: creds: ${{ secrets.ECOSYSTEM_ISSUE_TRIAGE_GH_APP_CREDS }} org: electron - name: Add to Project - uses: dsanders11/project-actions/add-item@2134fe7cc71c58b7ae259c82a8e63c6058255678 # v1.7.0 + uses: dsanders11/project-actions/add-item@5767984408ccc6742f83acc8b8d8ea5e09f329af # v2.0.0 with: field: Opened field-value: ${{ github.event.pull_request.created_at || github.event.issue.created_at }} diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c51a5c0842..89f73d436c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -13,12 +13,12 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} steps: - name: Generate GitHub App token - uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1 + uses: electron/github-app-auth-action@e14e47722ed120360649d0789e25b9baece12725 # v2.0.0 id: generate-token with: creds: ${{ secrets.GH_APP_CREDS }} - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: submodules: true fetch-depth: 0 @@ -50,7 +50,7 @@ jobs: GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} - name: Commit docs - uses: dsanders11/github-app-commit-action@43de6da2f4d927e997c0784c7a0b61bd19ad6aac # v1.5.0 + uses: dsanders11/github-app-commit-action@2bbcd331016d8c950b05a24b56e7eb9cb50d545e # v2.1.0 with: fail-on-no-changes: false message: 'deploy: ${{ steps.get-short-sha.outputs.sha }}'