Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
55 changes: 45 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Test

on:
pull_request:
branches:
- main
push:
branches:
- main
Expand All @@ -29,15 +27,15 @@ 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
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
- 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
Expand All @@ -49,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"
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
22.17
4 changes: 3 additions & 1 deletion forge.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}),
},
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
19 changes: 6 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down