diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ef8ad9..60ca976 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive @@ -28,7 +28,7 @@ jobs: ./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt - name: Cache vcpkg - uses: actions/cache@v2 + uses: actions/cache@v4 id: vcpkg-cache env: cache-name: vcpkg-cache @@ -37,14 +37,13 @@ jobs: key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }} - name: Configure CMake - run: cmake --preset github-workflows + run: cmake --preset github-workflows -Wno-deprecated - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: MapMarkerFramework path: ${{ github.workspace }}/build/${{ env.BUILD_TYPE }}/MapMarkerFramework.dll - diff --git a/external/CommonLibSSE b/external/CommonLibSSE index 5e776fd..e0f14fd 160000 --- a/external/CommonLibSSE +++ b/external/CommonLibSSE @@ -1 +1 @@ -Subproject commit 5e776fd35aa0d3d8369a4d709aa63a58f022abfe +Subproject commit e0f14fd29b09f0985edfb655613edf5020806057 diff --git a/vcpkg.json b/vcpkg.json index 3b1090e..e04358f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "mapmarkerframework", "version": "2", "dependencies": [ @@ -11,5 +11,12 @@ "jsoncpp", "simpleini", "tsl-ordered-map" + ], + "builtin-baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48", + "overrides": [ + { + "name": "xbyak", + "version": "6.69" + } ] }