diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 47e2208..dfb3169 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -22,7 +22,8 @@ runs: (Get-Content -Raw build/edge_coreclr.vcxproj) -replace 'Strict', '' | Out-File -Encoding Utf8 build/edge_coreclr.vcxproj (Get-Content -Raw build/edge_nativeclr.vcxproj) -replace 'Strict', '' | Out-File -Encoding Utf8 build/edge_nativeclr.vcxproj } - if ( '${{ inputs.electron }}' -ge 32 -And '${{ inputs.arch }}' -eq 'arm64'){ + + if ( '${{ inputs.electron }}' -ge 32){ (Get-Content -Raw build/build_managed.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/build_managed.vcxproj (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 diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index 05295bf..a6a6b57 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -19,7 +19,7 @@ jobs: electron: [29, 30, 31, 32, 33] os: [windows-2022] - name: build ${{ matrix.os }}-v${{ matrix.electron }} + name: build ${{ matrix.os }}-electron-${{ matrix.electron }} steps: - name: Checkout code @@ -91,9 +91,10 @@ jobs: strategy: matrix: os: [windows-2022] + electron: ['${{ needs.build.outputs.test-version }}'] # fail-fast: false - name: test ${{ matrix.os }}-v${{ needs.build.outputs.test-version }} + name: test ${{ matrix.os }}-v${{ matrix.electron }} steps: - name: Checkout code diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81f4b1e..4d40717 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: matrix: os: [windows-2022] - name: build ${{ matrix.os }}-v${{ inputs.build-version }} + name: build ${{ matrix.os }}-electron-${{ inputs.build-version }} steps: - name: Checkout code