Skip to content

Commit

Permalink
upgrade Ωedit to solve DE startup problem under Windows, replace node…
Browse files Browse the repository at this point in the history
… 16 with 20 in CI

also set minimum VSCode to 1.92.1 (July 2024) up from 1.91.1 (June 2024) for Electron 30 on
Node.js 18 with the spawn CVE fix.
  • Loading branch information
scholarsmate committed Oct 23, 2024
1 parent b1d388a commit 9ba3380
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
push:
branches-ignore: [ 'dependabot/**' ]
pull_request:
types: [opened, synchronize, reopened]
types: [ opened, synchronize, reopened ]

jobs:
single-commit:
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
java_distribution: [ temurin ]
java_version: [ 8 ]
os: [ ubuntu-20.04 ]
node: [ '16' ]
node: [ '18' ]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down Expand Up @@ -126,14 +126,14 @@ jobs:
run: $SBT ratCheck || (cat target/rat.txt; exit 1)

build-test-package:
name: 'Build, Test, and Package (OS: ${{ matrix.os }}, Node: ${{ matrix.node }}, Java: ${{ matrix.java_version }})'
name: 'Build, Test, and Package (OS: ${{ matrix.os }}, Node: ${{ matrix.node }}, Java: ${{ matrix.java_version }}, VS Code: ${{ matrix.vscode }})'
strategy:
matrix:
java_distribution: [ temurin ]
java_version: [ 8, 11, 17 ]
os: [ macos-12, ubuntu-20.04, windows-2019 ]
node: [ '16', '18.20.1' ] # version 18.20.2 (current latest of 18) is broken on windows
vscode: [ '1.91.1' ]
node: [ '18.20.1', '20' ] # version 18.20.2 (current latest of 18) is broken on windows
vscode: [ '1.92.1' ]
fail-fast: false # don't immediately fail all other jobs if a single job fails
runs-on: ${{ matrix.os }}
defaults:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ on:

jobs:
build-test-package:
name: 'Build, Test, and Package (OS: ${{ matrix.os }}, Node: ${{ matrix.node }}, Java: ${{ matrix.java_version }}, VS Code: ${{ matrix.vscode }} )'
name: 'Build, Test, and Package (OS: ${{ matrix.os }}, Node: ${{ matrix.node }}, Java: ${{ matrix.java_version }}, VS Code: ${{ matrix.vscode }})'
strategy:
matrix:
os: [ macos-12, ubuntu-20.04, windows-2019, macos-latest, ubuntu-latest, windows-latest ]
node: [ '16', '18.20.1' ] # version 18.20.2 (current latest of 18) is broken on windows
vscode: [ '1.91.1', 'stable', 'insiders' ]
node: [ '18.20.1', '20' ] # version 18.20.2 (current latest of 18) is broken on windows
vscode: [ '1.92.1', 'stable', 'insiders' ]
java_distribution: [ temurin ]
java_version: [ 8, 11, 17 ]
exclude:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"svelte:check": "svelte-check --tsconfig ./tsconfig.json"
},
"dependencies": {
"@omega-edit/client": "0.9.82",
"@omega-edit/client": "0.9.83",
"@viperproject/locate-java-home": "1.1.15",
"@vscode/debugadapter": "1.63.0",
"@vscode/webview-ui-toolkit": "^1.2.2",
Expand Down

0 comments on commit 9ba3380

Please sign in to comment.