From 439f1d11c4e618aea81efdd409759e00f344173f Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 18 Nov 2025 17:09:00 -0800 Subject: [PATCH 01/10] build: add `build.yml` workflow --- .github/workflows/build.yml | 59 +++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 10 ++---- .nvmrc | 2 +- package.json | 2 +- yarn.lock | 19 ++++------- 6 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..098e3db586 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,59 @@ +name: Test + +on: + pull_request: + push: + branches: + - main + workflow_call: + +permissions: + contents: read + +jobs: + test: + name: Build + strategy: + fail-fast: false + matrix: + os: + - macos-15-intel + - ubuntu-latest + - windows-latest + arch: + - x64 + include: + - os: macos-latest + arch: arm64 + - os: ubuntu-24.04-arm + arch: armv7l + runs-on: "${{ matrix.os }}" + steps: + - run: git config --global core.autocrlf input + - name: Checkout + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 + - name: Setup Node.js + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version-file: .nvmrc + cache: 'yarn' + - name: Install dependencies + run: yarn --immutable + - run: yarn run contributors + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: yarn run electron-releases + - name: Lint and format + run: yarn run lint && yarn run format + - name: Test + run: yarn tsc && yarn test:ci + + gha-done: + name: GitHub Actions Completed + runs-on: ubuntu-latest + needs: [test] + if: always() && !contains(needs.*.result, 'failure') + steps: + - name: GitHub Actions Jobs Done + run: | + echo "All GitHub Actions Jobs are done" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e742a6fb47..26aab0862e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: - node-version: '22.17.x' + node-version-file: .nvmrc - run: yarn install --immutable - run: yarn run contributors env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 341d673fe3..cc480d60a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,8 +2,6 @@ name: Test on: pull_request: - branches: - - main push: branches: - main @@ -37,7 +35,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: - node-version: '22.17.x' + node-version-file: .nvmrc cache: 'yarn' - name: Install dependencies run: yarn --immutable @@ -45,10 +43,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn run electron-releases - - name: Lint and format - run: yarn run lint && yarn run format - - name: Test - run: yarn tsc && yarn test:ci + - name: Run Forge makers + run: yarn run make gha-done: name: GitHub Actions Completed diff --git a/.nvmrc b/.nvmrc index 8fdd954df9..e763ca155d 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22 \ No newline at end of file +22.17 \ No newline at end of file diff --git a/package.json b/package.json index 8f254ab737..ce529b7b20 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "@types/enzyme-adapter-react-16": "^1.0.6", "@types/fs-extra": "^9.0.7", "@types/getos": "^3.0.1", - "@types/node": "~22.10.7", + "@types/node": "^22.19.1", "@types/parse-env-string": "^1.0.2", "@types/react": "^16.14.0", "@types/react-dom": "^16.9.11", diff --git a/yarn.lock b/yarn.lock index 16e4fb8dba..a82086459e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3312,12 +3312,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:~22.10.7": - version: 22.10.10 - resolution: "@types/node@npm:22.10.10" +"@types/node@npm:^22.19.1": + version: 22.19.1 + resolution: "@types/node@npm:22.19.1" dependencies: - undici-types: "npm:~6.20.0" - checksum: 10c0/3425772d4513cd5dbdd87c00acda088113c03a97445f84f6a89744c60a66990b56c9d3a7213d09d57b6b944ae8ff45f985565e0c1846726112588e33a22dd12b + undici-types: "npm:~6.21.0" + checksum: 10c0/6edd93aea86da740cb7872626839cd6f4a67a049d3a3a6639cb592c620ec591408a30989ab7410008d1a0b2d4985ce50f1e488e79c033e4476d3bec6833b0a2f languageName: node linkType: hard @@ -6146,7 +6146,7 @@ __metadata: "@types/enzyme-adapter-react-16": "npm:^1.0.6" "@types/fs-extra": "npm:^9.0.7" "@types/getos": "npm:^3.0.1" - "@types/node": "npm:~22.10.7" + "@types/node": "npm:^22.19.1" "@types/parse-env-string": "npm:^1.0.2" "@types/react": "npm:^16.14.0" "@types/react-dom": "npm:^16.9.11" @@ -14765,13 +14765,6 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~6.20.0": - version: 6.20.0 - resolution: "undici-types@npm:6.20.0" - checksum: 10c0/68e659a98898d6a836a9a59e6adf14a5d799707f5ea629433e025ac90d239f75e408e2e5ff086afc3cace26f8b26ee52155293564593fbb4a2f666af57fc59bf - languageName: node - linkType: hard - "undici-types@npm:~6.21.0": version: 6.21.0 resolution: "undici-types@npm:6.21.0" From 1b1562bc5d50ccc04eef786e95403bcf2a837815 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 18 Nov 2025 17:16:37 -0800 Subject: [PATCH 02/10] don't sign if env doesn't exist --- forge.config.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge.config.ts b/forge.config.ts index 40fb6b3a05..20766cb917 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -124,7 +124,9 @@ const config: ForgeConfig = { noMsi: true, setupExe: `electron-fiddle-${version}-win32-${arch}-setup.exe`, setupIcon: path.resolve(iconDir, 'fiddle.ico'), - signWithParams: `/sha1 ${process.env.CERT_FINGERPRINT} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256`, + signWithParams: process.env.CERT_FINGERPRINT + ? `/sha1 ${process.env.CERT_FINGERPRINT} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256` + : undefined, }), }, { From d595364c61c6b82211977c56d656f3a6e3ea3b4f Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 18 Nov 2025 17:28:08 -0800 Subject: [PATCH 03/10] also upload the artifact --- .github/workflows/test.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc480d60a8..a6247f316a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: arch: arm64 - os: ubuntu-24.04-arm arch: armv7l - runs-on: "${{ matrix.os }}" + runs-on: '${{ matrix.os }}' steps: - run: git config --global core.autocrlf input - name: Checkout @@ -45,13 +45,17 @@ jobs: - run: yarn run electron-releases - name: Run Forge makers run: yarn run make + - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} + path: out gha-done: name: GitHub Actions Completed runs-on: ubuntu-latest needs: [test] if: always() && !contains(needs.*.result, 'failure') - steps: - - name: GitHub Actions Jobs Done - run: | - echo "All GitHub Actions Jobs are done" + steps: + - name: GitHub Actions Jobs Done + run: | + echo "All GitHub Actions Jobs are done" From 9f73afab94cf135e189992db32851525180ebac5 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 18 Nov 2025 17:34:03 -0800 Subject: [PATCH 04/10] i named them backwards --- .github/workflows/build.yml | 22 ++++++++++++---------- .github/workflows/test.yml | 22 ++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 098e3db586..a6247f316a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ permissions: jobs: test: - name: Build + name: Test strategy: fail-fast: false matrix: @@ -27,7 +27,7 @@ jobs: arch: arm64 - os: ubuntu-24.04-arm arch: armv7l - runs-on: "${{ matrix.os }}" + runs-on: '${{ matrix.os }}' steps: - run: git config --global core.autocrlf input - name: Checkout @@ -43,17 +43,19 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn run electron-releases - - name: Lint and format - run: yarn run lint && yarn run format - - name: Test - run: yarn tsc && yarn test:ci + - name: Run Forge makers + run: yarn run make + - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} + path: out gha-done: name: GitHub Actions Completed runs-on: ubuntu-latest needs: [test] if: always() && !contains(needs.*.result, 'failure') - steps: - - name: GitHub Actions Jobs Done - run: | - echo "All GitHub Actions Jobs are done" + steps: + - name: GitHub Actions Jobs Done + run: | + echo "All GitHub Actions Jobs are done" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a6247f316a..098e3db586 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ permissions: jobs: test: - name: Test + name: Build strategy: fail-fast: false matrix: @@ -27,7 +27,7 @@ jobs: arch: arm64 - os: ubuntu-24.04-arm arch: armv7l - runs-on: '${{ matrix.os }}' + runs-on: "${{ matrix.os }}" steps: - run: git config --global core.autocrlf input - name: Checkout @@ -43,19 +43,17 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: yarn run electron-releases - - name: Run Forge makers - run: yarn run make - - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 - with: - name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} - path: out + - name: Lint and format + run: yarn run lint && yarn run format + - name: Test + run: yarn tsc && yarn test:ci gha-done: name: GitHub Actions Completed runs-on: ubuntu-latest needs: [test] if: always() && !contains(needs.*.result, 'failure') - steps: - - name: GitHub Actions Jobs Done - run: | - echo "All GitHub Actions Jobs are done" + steps: + - name: GitHub Actions Jobs Done + run: | + echo "All GitHub Actions Jobs are done" From f48dfa64d82d01e2a6a7bf5873c198a37b310fc5 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Tue, 18 Nov 2025 17:35:46 -0800 Subject: [PATCH 05/10] single workflow? --- .github/workflows/build.yml | 61 ------------------------------------- .github/workflows/test.yml | 53 +++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 69 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index a6247f316a..0000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Test - -on: - pull_request: - push: - branches: - - main - workflow_call: - -permissions: - contents: read - -jobs: - test: - name: Test - strategy: - fail-fast: false - matrix: - os: - - macos-15-intel - - ubuntu-latest - - windows-latest - arch: - - x64 - include: - - os: macos-latest - arch: arm64 - - os: ubuntu-24.04-arm - arch: armv7l - runs-on: '${{ matrix.os }}' - steps: - - run: git config --global core.autocrlf input - - name: Checkout - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - - name: Setup Node.js - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 - with: - node-version-file: .nvmrc - cache: 'yarn' - - name: Install dependencies - run: yarn --immutable - - run: yarn run contributors - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: yarn run electron-releases - - name: Run Forge makers - run: yarn run make - - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 - with: - name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} - path: out - - gha-done: - name: GitHub Actions Completed - runs-on: ubuntu-latest - needs: [test] - if: always() && !contains(needs.*.result, 'failure') - steps: - - name: GitHub Actions Jobs Done - run: | - echo "All GitHub Actions Jobs are done" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 098e3db586..c683e5187f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ permissions: jobs: test: - name: Build + name: Test strategy: fail-fast: false matrix: @@ -27,7 +27,7 @@ jobs: arch: arm64 - os: ubuntu-24.04-arm arch: armv7l - runs-on: "${{ matrix.os }}" + runs-on: '${{ matrix.os }}' steps: - run: git config --global core.autocrlf input - name: Checkout @@ -47,13 +47,50 @@ jobs: run: yarn run lint && yarn run format - name: Test run: yarn tsc && yarn test:ci - + build: + name: Build + strategy: + fail-fast: false + matrix: + os: + - macos-15-intel + - ubuntu-latest + - windows-latest + arch: + - x64 + include: + - os: macos-latest + arch: arm64 + - os: ubuntu-24.04-arm + arch: armv7l + runs-on: '${{ matrix.os }}' + steps: + - run: git config --global core.autocrlf input + - name: Checkout + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 + - name: Setup Node.js + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version-file: .nvmrc + cache: 'yarn' + - name: Install dependencies + run: yarn --immutable + - run: yarn run contributors + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: yarn run electron-releases + - name: Run Forge makers + run: yarn run make + - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} + path: out gha-done: name: GitHub Actions Completed runs-on: ubuntu-latest - needs: [test] + needs: [test, build] if: always() && !contains(needs.*.result, 'failure') - steps: - - name: GitHub Actions Jobs Done - run: | - echo "All GitHub Actions Jobs are done" + steps: + - name: GitHub Actions Jobs Done + run: | + echo "All GitHub Actions Jobs are done" From aab965971276ed3d3f4fe2b292c52f555946b61c Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Wed, 19 Nov 2025 10:40:10 -0800 Subject: [PATCH 06/10] split up jobs --- .github/workflows/build.yml | 46 ++++++++++++++++++ .github/workflows/ci.yml | 29 ++++++++++++ .github/workflows/test.yml | 93 ++++++++++++++++--------------------- 3 files changed, 114 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..5b495de3ca --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,46 @@ +name: Build + +# Called from ci +on: + workflow_call: + +jobs: + build: + name: Build + strategy: + fail-fast: false + matrix: + os: + - macos-15-intel + - ubuntu-latest + - windows-latest + arch: + - x64 + include: + - os: macos-latest + arch: arm64 + - os: ubuntu-24.04-arm + arch: armv7l + runs-on: '${{ matrix.os }}' + steps: + - run: git config --global core.autocrlf input + - name: Checkout + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 + - name: Setup Node.js + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version-file: .nvmrc + cache: 'yarn' + - name: Install dependencies + run: yarn --immutable + - run: yarn run contributors + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: yarn run electron-releases + # Artifacts generated are unsigned + - name: Run Forge makers + run: yarn run make + - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} + path: out diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..1f36304ad3 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: CI + +on: + pull_request: + push: + branches: + - main + +permissions: + contents: read + +jobs: + test: + permissions: + contents: read + uses: ./.github/workflows/test.yml + build: + permissions: + contents: read + uses: ./.github/workflows/build.yml + gha-done: + name: GitHub Actions Completed + runs-on: ubuntu-latest + needs: [test, build] + if: always() && !contains(needs.*.result, 'failure') + steps: + - name: GitHub Actions Jobs Done + run: | + echo "All GitHub Actions Jobs are done" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c683e5187f..974ebcfb00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,15 +1,9 @@ +# Called during ci and release name: Test on: - pull_request: - push: - branches: - - main workflow_call: -permissions: - contents: read - jobs: test: name: Test @@ -47,50 +41,41 @@ jobs: run: yarn run lint && yarn run format - name: Test run: yarn tsc && yarn test:ci - build: - name: Build - strategy: - fail-fast: false - matrix: - os: - - macos-15-intel - - ubuntu-latest - - windows-latest - arch: - - x64 - include: - - os: macos-latest - arch: arm64 - - os: ubuntu-24.04-arm - arch: armv7l - runs-on: '${{ matrix.os }}' - steps: - - run: git config --global core.autocrlf input - - name: Checkout - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - - name: Setup Node.js - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 - with: - node-version-file: .nvmrc - cache: 'yarn' - - name: Install dependencies - run: yarn --immutable - - run: yarn run contributors - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: yarn run electron-releases - - name: Run Forge makers - run: yarn run make - - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 - with: - name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} - path: out - gha-done: - name: GitHub Actions Completed - runs-on: ubuntu-latest - needs: [test, build] - if: always() && !contains(needs.*.result, 'failure') - steps: - - name: GitHub Actions Jobs Done - run: | - echo "All GitHub Actions Jobs are done" + # build: + # name: Build + # strategy: + # fail-fast: false + # matrix: + # os: + # - macos-15-intel + # - ubuntu-latest + # - windows-latest + # arch: + # - x64 + # include: + # - os: macos-latest + # arch: arm64 + # - os: ubuntu-24.04-arm + # arch: armv7l + # runs-on: '${{ matrix.os }}' + # steps: + # - run: git config --global core.autocrlf input + # - name: Checkout + # uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 + # - name: Setup Node.js + # uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + # with: + # node-version-file: .nvmrc + # cache: 'yarn' + # - name: Install dependencies + # run: yarn --immutable + # - run: yarn run contributors + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - run: yarn run electron-releases + # - name: Run Forge makers + # run: yarn run make + # - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + # with: + # name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} + # path: out From bf4c986cb32b3ddcc06d98b11b42a8a6a7862ef0 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Wed, 19 Nov 2025 10:48:59 -0800 Subject: [PATCH 07/10] remove commented code --- .github/workflows/test.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 974ebcfb00..6de288d57f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,41 +41,3 @@ jobs: run: yarn run lint && yarn run format - name: Test run: yarn tsc && yarn test:ci - # build: - # name: Build - # strategy: - # fail-fast: false - # matrix: - # os: - # - macos-15-intel - # - ubuntu-latest - # - windows-latest - # arch: - # - x64 - # include: - # - os: macos-latest - # arch: arm64 - # - os: ubuntu-24.04-arm - # arch: armv7l - # runs-on: '${{ matrix.os }}' - # steps: - # - run: git config --global core.autocrlf input - # - name: Checkout - # uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - # - name: Setup Node.js - # uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 - # with: - # node-version-file: .nvmrc - # cache: 'yarn' - # - name: Install dependencies - # run: yarn --immutable - # - run: yarn run contributors - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - run: yarn run electron-releases - # - name: Run Forge makers - # run: yarn run make - # - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 - # with: - # name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} - # path: out From 97e7275a0c2879a143555aaedfb9d0f4586c72da Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Wed, 19 Nov 2025 11:49:57 -0800 Subject: [PATCH 08/10] also build universal target! --- .github/workflows/build.yml | 2 ++ .github/workflows/release.yml | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b495de3ca..c5a67518d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ jobs: include: - os: macos-latest arch: arm64 + - os: macos-latest + arch: universal - os: ubuntu-24.04-arm arch: armv7l runs-on: '${{ matrix.os }}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26aab0862e..4d4c6a1c97 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,13 +22,15 @@ jobs: include: - os: macos-latest arch: arm64 + - os: macos-latest + arch: universal - os: ubuntu-24.04-arm arch: armv7l - os: ubuntu-24.04-arm arch: arm64 - os: windows-latest arch: ia32 - runs-on: "${{ matrix.os }}" + runs-on: '${{ matrix.os }}' permissions: actions: write contents: read @@ -63,9 +65,9 @@ jobs: shell: bash env: SM_CLIENT_CERT_P12_BASE64: ${{ secrets.SM_CLIENT_CERT_P12_BASE64 }} - run: | + run: | echo "$SM_CLIENT_CERT_P12_BASE64" | base64 --decode > /d/cert.p12 - echo "SM_CLIENT_CERT_FILE=D:\\cert.p12" >> "$GITHUB_ENV" + echo "SM_CLIENT_CERT_FILE=D:\\cert.p12" >> "$GITHUB_ENV" - name: Sync cert (Windows) if: ${{ startsWith(matrix.os, 'windows-') }} shell: cmd From 5d8d0834fb2b189b347f4d69f24e9c7d33ac04cc Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Wed, 19 Nov 2025 12:31:25 -0800 Subject: [PATCH 09/10] Revert "also build universal target!" This reverts commit 97e7275a0c2879a143555aaedfb9d0f4586c72da. --- .github/workflows/build.yml | 2 -- .github/workflows/release.yml | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5a67518d0..5b495de3ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,8 +19,6 @@ jobs: include: - os: macos-latest arch: arm64 - - os: macos-latest - arch: universal - os: ubuntu-24.04-arm arch: armv7l runs-on: '${{ matrix.os }}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d4c6a1c97..26aab0862e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,15 +22,13 @@ jobs: include: - os: macos-latest arch: arm64 - - os: macos-latest - arch: universal - os: ubuntu-24.04-arm arch: armv7l - os: ubuntu-24.04-arm arch: arm64 - os: windows-latest arch: ia32 - runs-on: '${{ matrix.os }}' + runs-on: "${{ matrix.os }}" permissions: actions: write contents: read @@ -65,9 +63,9 @@ jobs: shell: bash env: SM_CLIENT_CERT_P12_BASE64: ${{ secrets.SM_CLIENT_CERT_P12_BASE64 }} - run: | + run: | echo "$SM_CLIENT_CERT_P12_BASE64" | base64 --decode > /d/cert.p12 - echo "SM_CLIENT_CERT_FILE=D:\\cert.p12" >> "$GITHUB_ENV" + echo "SM_CLIENT_CERT_FILE=D:\\cert.p12" >> "$GITHUB_ENV" - name: Sync cert (Windows) if: ${{ startsWith(matrix.os, 'windows-') }} shell: cmd From dfcd25464b72a7215aa22f68e9df39b64d53301b Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Wed, 19 Nov 2025 12:31:49 -0800 Subject: [PATCH 10/10] don't upload test artifacts --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b495de3ca..b7b0e05d89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,3 @@ jobs: # Artifacts generated are unsigned - name: Run Forge makers run: yarn run make - - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 - with: - name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }} - path: out