From cba033b198c64c2c1016352d99fa11f83e9e7fb8 Mon Sep 17 00:00:00 2001 From: agracio Date: Thu, 26 Sep 2024 18:22:49 +0100 Subject: [PATCH] updating install tools for Electron 32 --- .github/workflows/build.yml | 16 +--------------- .github/workflows/main.yml | 8 ++++---- package-lock.json | 14 +++++++------- package.json | 2 +- tools/install.js | 9 ++++++++- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3002d57..9971d2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,20 +60,6 @@ jobs: echo "test-version=32.1.2" >> $GITHUB_OUTPUT fi - # - name: Resolve Node.js version - # id: node-version - # shell: bash - # run: | - # if [[ ${{ inputs.build-version }} == '29.0.0' ]]; then - # echo "node=20" >> $GITHUB_OUTPUT - # elif [[ ${{ inputs.build-version }} == '30.0.0' ]]; then - # echo "node=20" >> $GITHUB_OUTPUT - # elif [[ ${{ inputs.build-version }} == '31.0.0' ]]; then - # echo "node=20" >> $GITHUB_OUTPUT - # elif [[ ${{ inputs.build-version }} == '32.0.0' ]]; then - # echo "node=20" >> $GITHUB_OUTPUT - # fi - - name: Setup env uses: ./.github/actions/setup-env with: @@ -101,7 +87,7 @@ jobs: (Get-Content -Raw build/edge_coreclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_coreclr.vcxproj (Get-Content -Raw build/edge_nativeclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_nativeclr.vcxproj } - + node-gyp build cmd /c copy /y build\Release\edge_*.node release\ia32\${{ inputs.build-version }} cmd /c rmdir /S /Q build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b44558..2146036 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,10 +42,10 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, macos-14, ubuntu-22.04, windows-2022] - # os: [ windows-2022, ubuntu-22.04] - # electron: [30.5.0] - electron: [29.4.6, 30.5.1, 31.6.0] + # os: [macos-13, macos-14, ubuntu-22.04, windows-2022] + os: [ macos-13, macos-14, ubuntu-22.04] + electron: [32.1.2] + # electron: [29.4.6, 30.5.1, 31.6.0, 32.1.2] # electron: [31.6.0, 32.1.0] name: test-${{ matrix.os }}-v${{ matrix.electron }} diff --git a/package-lock.json b/package-lock.json index b664eca..1a4501e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "nan": "git://github.com/oc-soft/npm-nan" }, "devDependencies": { - "electron": "=31.6.0", + "electron": "^32.0.0", "mocha": "10.7.3", "mochawesome": "^7.1.3", "mochawesome-merge": "^4.3.0", @@ -522,9 +522,9 @@ } }, "node_modules/electron": { - "version": "31.6.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-31.6.0.tgz", - "integrity": "sha512-J64VtIF8DI/zsGgoYd3p5LbxAWjt59tk2cBSHJNzVhzgiVgDyPFkBwsqmN4gUvyv+6l6+WoYpYmYdapr2o4bPw==", + "version": "32.1.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.1.2.tgz", + "integrity": "sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -2633,9 +2633,9 @@ "integrity": "sha512-sFwGCGmoa9JdODegeDFJL4IH6N8IgDobxbS31BiXaiOdf8bC7EyHigFp0WYRKhIgK72E9nLnNwiRJRMO/AYGdg==" }, "electron": { - "version": "31.6.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-31.6.0.tgz", - "integrity": "sha512-J64VtIF8DI/zsGgoYd3p5LbxAWjt59tk2cBSHJNzVhzgiVgDyPFkBwsqmN4gUvyv+6l6+WoYpYmYdapr2o4bPw==", + "version": "32.1.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.1.2.tgz", + "integrity": "sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==", "dev": true, "requires": { "@electron/get": "^2.0.0", diff --git a/package.json b/package.json index bf29bda..2a82577 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "nan": "git://github.com/oc-soft/npm-nan" }, "devDependencies": { - "electron": "=31.6.0", + "electron": "^32.0.0", "mocha": "10.7.3", "mochawesome": "^7.1.3", "mochawesome-merge": "^4.3.0", diff --git a/tools/install.js b/tools/install.js index 1a18361..dcd0ef9 100644 --- a/tools/install.js +++ b/tools/install.js @@ -136,7 +136,14 @@ else { } if (version !== null) { - spawn('node-gyp', ['configure', 'build', '--target='+version, '--disturl=https://electronjs.org/headers'], { stdio: 'inherit' }); + spawn('node-gyp', ['configure', '--target='+version, '--runtime=electron', '--disturl=https://electronjs.org/headers'], { stdio: 'inherit' }); + + if(version.startsWith('32')){ + spawn("sed -i -e 's/std:c++17/std:c++20/g' build/build_managed.vcxproj", { stdio: 'inherit' }); + spawn("sed -i -e 's/std:c++17/std:c++20/g' build/edge_coreclr.vcxproj", { stdio: 'inherit' }); + spawn("sed -i -e 's/std:c++17/std:c++20/g' build/edge_nativeclr.vcxproj", { stdio: 'inherit' }); + } + spawn('node-gyp', ['build'], { stdio: 'inherit' }); } else spawn('node-gyp', ['configure', 'build'], { stdio: 'inherit' });