diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a4ff95..8ba75b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,8 +43,7 @@ jobs: matrix: # os: [macos-14, macos-latest, ubuntu-latest, windows-2019] os: [ ubuntu-latest] - # electron: [30.5.0, 31.6.0] - electron: [30.5.0, 31.3.0] + electron: [30.5.0, 31.6.0, 32.1.0] steps: - name: Checkout code uses: actions/checkout@v4 @@ -53,17 +52,17 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - # cache: 'npm' - # cache-dependency-path: package-lock.json + cache: 'npm' + cache-dependency-path: package-lock.json - # - name: Cache node modules - # id: cache-nodemodules - # uses: actions/cache@v4 - # env: - # cache-name: cache-node-modules - # with: - # path: node_modules - # key: ${{ matrix.os }}-${{ matrix.electron }}-${{ hashFiles('package-lock.json') }} + - name: Cache node modules + id: cache-nodemodules + uses: actions/cache@v4 + env: + cache-name: cache-node-modules + with: + path: node_modules + key: ${{ matrix.os }}-${{ matrix.electron }}-${{ hashFiles('package-lock.json') }} - name: Setup dotnet uses: actions/setup-dotnet@v4 @@ -73,7 +72,7 @@ jobs: - name: Versions run: node -v && npm -v && dotnet --version && node -p process.platform && node -p process.arch - - name: setup electorn version + - name: setup electron version run: | sed -i -e 's/"electron": "=31.6.0"/"electron": "=${{ matrix.electron }}"/g' package.json @@ -88,20 +87,21 @@ jobs: uses: andstor/file-existence-action@v3 with: files: "build/Release/edge_coreclr.node" - - - if: (runner.os == 'macOS' || runner.os == 'Linux') && steps.check_build.outputs.files_exists == 'false' - name: Check electron-edge-js build file - run: | - echo "::error file=app.js::Failed to build electron-edge-js for Electron ${{ matrix.electron }}" - exit 1 + fail: true continue-on-error: true + # - if: (runner.os == 'macOS' || runner.os == 'Linux') && steps.check_build.outputs.files_exists == 'false' + # name: electron-edge-js build failed + # run: | + # echo "::error file=app.js::Failed to build electron-edge-js for Electron ${{ matrix.electron }}" + # exit 1 + # continue-on-error: true + - if: runner.os == 'Windows' name: Run .NET 4.5 tests run: node tools/test.js CI - - if: runner.os == 'Windows' - name: "Run .net core tests Windows" + - name: "Run .net core tests Windows" run: node tools/test.js CI env: EDGE_USE_CORECLR: 1 diff --git a/package-lock.json b/package-lock.json index 24e1a6f..d776d43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1664,7 +1664,9 @@ }, "node_modules/nan": { "version": "2.20.0", - "resolved": "git+ssh://git@github.com/nodejs/nan.git#2c18d907564fe9d7f6f4f3ac44471927afd29286" + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", @@ -3477,8 +3479,9 @@ "dev": true }, "nan": { - "version": "git+ssh://git@github.com/nodejs/nan.git#2c18d907564fe9d7f6f4f3ac44471927afd29286", - "from": "nan@^2.20.0" + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==" }, "normalize-path": { "version": "3.0.0",