Merge branch 'master' into vw_slim_fix

VowpalWabbit · May 9, 2024 · 8e16073 · 8e16073
2 parents 5299e6b + 4ef9bfc
commit 8e16073
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -21,8 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #os: [windows-latest, ubuntu-latest, macos-latest]
-        os: [ubuntu-latest, macos-latest] # Temporarily remove windows asan
+        #os: [windows-latest, ubuntu-latest, macos-13]
+        os: [ubuntu-latest, macos-13] # Temporarily remove windows asan
         preset: [vcpkg-asan-debug, vcpkg-ubsan-debug]
         exclude:
           # UBSan not supported by MSVC on Windows

diff --git a/.github/workflows/dotnet_nugets.yml b/.github/workflows/dotnet_nugets.yml
@@ -23,7 +23,7 @@ jobs:
         config:
           - { os: "windows-latest", runtime_id: "win-x64" }
           - { os: "ubuntu-latest", runtime_id: "linux-x64" }
-          - { os: "macos-latest", runtime_id: "osx-x64" }
+          - { os: "macos-13", runtime_id: "osx-x64" }
     runs-on: ${{matrix.config.os}}
     steps:
       # Setup for build
@@ -143,7 +143,7 @@ jobs:
         config:
           - { os: "windows-latest", runtime_id: "win-x64" }
           - { os: "ubuntu-latest", runtime_id: "linux-x64" }
-          - { os: "macos-latest", runtime_id: "osx-x64" }
+          - { os: "macos-13", runtime_id: "osx-x64" }
     runs-on: ${{matrix.config.os}}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/vcpkg_build.yml b/.github/workflows/vcpkg_build.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
         preset: [vcpkg-debug, vcpkg-release]
     steps:
       - uses: actions/checkout@v3

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,8 @@
             ],
             "url": "./test/vwtest.schema.json"
         }
-    ]
+    ],
+    "files.associations": {
+        "limits": "cpp"
+    }
 }