diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08ae12054..8a5e02499 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup emsdk - uses: mymindstorm/setup-emsdk@v14 + uses: pyodide/setup-emsdk@v15 with: version: ${{ env.EMSCRIPTEN_VERSION }} actions-cache-folder: emsdk-cache-${{ runner.os }} @@ -113,7 +113,7 @@ jobs: include/**/*.h create_package: - runs-on: windows-2019 + runs-on: windows-2022 needs: build if: | (github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.ref, 'nuget') || startsWith(github.ref, 'refs/tags/v'))) || diff --git a/src/Parser/ParserOptions.cs b/src/Parser/ParserOptions.cs index 0fa5d5fde..b12562ed2 100644 --- a/src/Parser/ParserOptions.cs +++ b/src/Parser/ParserOptions.cs @@ -160,6 +160,7 @@ public void SetupMSVC(VisualStudioVersion vsVersion) AddArguments("-fms-extensions"); AddArguments("-fms-compatibility"); AddArguments("-fdelayed-template-parsing"); + AddArguments("-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH"); } ///