Skip to content

Commit 8da7d14

Browse files
committed
Attempted compile fix
1 parent e55d30f commit 8da7d14

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: actions/checkout@v4
3838

3939
- name: Setup emsdk
40-
uses: mymindstorm/setup-emsdk@v14
40+
uses: pyodide/setup-emsdk@v15
4141
with:
4242
version: ${{ env.EMSCRIPTEN_VERSION }}
4343
actions-cache-folder: emsdk-cache-${{ runner.os }}
@@ -113,11 +113,8 @@ jobs:
113113
include/**/*.h
114114
115115
create_package:
116-
runs-on: windows-2019
116+
runs-on: windows-2022
117117
needs: build
118-
if: |
119-
(github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.ref, 'nuget') || startsWith(github.ref, 'refs/tags/v'))) ||
120-
(github.event.pull_request.head.repo.full_name != github.repository && (contains(github.event.pull_request.head.ref, 'nuget') || startsWith(github.event.pull_request.head.ref, 'refs/tags/v')))
121118

122119
env:
123120
DOTNET_NOLOGO: true
@@ -148,14 +145,3 @@ jobs:
148145
name: CppSharp.nupkg
149146
path: |
150147
artifacts/*.nupkg
151-
152-
- name: Upload package to GitHub Packages
153-
run: |
154-
cd artifacts
155-
dotnet nuget push "*.nupkg" --api-key ${{ secrets.GITHUB_TOKEN }} --source "https://nuget.pkg.github.com/mono/index.json" --skip-duplicate
156-
157-
- name: Publish package to nuget.org
158-
if: startsWith(github.ref, 'refs/tags/v')
159-
run: |
160-
cd artifacts
161-
dotnet nuget push "*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source "https://api.nuget.org/v3/index.json" --skip-duplicate

src/Parser/ParserOptions.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,11 @@ public void SetupMSVC(VisualStudioVersion vsVersion)
156156

157157
var clVersion = MSVCToolchain.GetCLVersion(vsVersion);
158158
ToolSetToUse = clVersion.Major * 10000000 + clVersion.Minor * 100000;
159-
159+
160160
AddArguments("-fms-extensions");
161161
AddArguments("-fms-compatibility");
162-
AddArguments("-fdelayed-template-parsing");
162+
AddArguments("-fdelayed-template-parsing");
163+
AddArguments("-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH");
163164
}
164165

165166
/// <summary>

0 commit comments

Comments
 (0)