Skip to content

Commit

Permalink
adding Electron 34
Browse files Browse the repository at this point in the history
  • Loading branch information
agracio committed Jan 18, 2025
1 parent e46f77a commit eb842ce
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 19 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,33 @@ jobs:
node tools/getVersion.js 33
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
build-34:
runs-on: windows-2022
timeout-minutes: 20
strategy:
fail-fast: false
outputs:
electron: ${{ steps.electron-version.outputs.electron }}

name: build electron-34.0.0
steps:

- name: Checkout code
uses: actions/checkout@v4

- name: Build Electron 34.0.0
uses: ./.github/actions/build-electron
with:
electron: 34
os: ${{ runner.os }}

- name: Get latest Electron version for 34.0.0
id: electron-version
shell: bash
run: |
node tools/getVersion.js 34
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
test-29:
strategy:
fail-fast: false
Expand Down Expand Up @@ -250,3 +277,24 @@ jobs:
electron: ${{ needs.build-33.outputs.electron }}
os: ${{ matrix.os }}

test-34:
strategy:
fail-fast: false
matrix:
os: [windows-2022]
runs-on: ${{ matrix.os }}
timeout-minutes: 10
needs: build-34

name: test ${{ matrix.os }}-v${{needs.build-34.outputs.electron}}
steps:

- name: Checkout code
uses: actions/checkout@v4

- name: Test build
uses: ./.github/actions/test-build
with:
electron: ${{ needs.build-34.outputs.electron }}
os: ${{ matrix.os }}

1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 31
- 32
- 33
- 34
# test-version:
# description: 'Electron version to test build'
# required: true
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "http://tomasz.janczuk.org",
"twitter": "tjanczuk"
},
"version": "33.0.5",
"version": "34.0.0",
"description": "Edge.js: run .NET and Node.js in-process on Electron",
"tags": [
"owin",
Expand Down Expand Up @@ -45,9 +45,9 @@
"nan": "^2.22.0"
},
"devDependencies": {
"electron": "^33.2.1",
"electron": "^34.0.0",
"follow-redirects": "^1.15.9",
"isomorphic-git": "^1.27.2",
"isomorphic-git": "^1.29.0",
"mocha": "11.0.1",
"mochawesome": "^7.1.3",
"mochawesome-merge": "^4.3.0",
Expand Down

0 comments on commit eb842ce

Please sign in to comment.