Merge pull request #1440 from Framstag/fix_msvc2019_build

Update to last vcpkg release
Framstag · Jun 24, 2023 · e680c2f · e680c2f
2 parents 2692a4d + 4198428
commit e680c2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_and test_on_vs2019.yml b/.github/workflows/build_and test_on_vs2019.yml
@@ -24,11 +24,11 @@ jobs:
         # Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg").
       - name: Restore from cache and install vcpkg
         # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op.
-        uses: lukka/run-vcpkg@v11.1 # https://github.com/lukka/run-vcpkg/releases/tag/v10.7
+        uses: lukka/run-vcpkg@v11.1
         with:
-          runVcpkgInstall: false                                                lukka/run-vcpkg
+          runVcpkgInstall: false
           vcpkgJsonGlob: '**/vcpkg.json'
-          vcpkgGitCommitId: 93e173a0d724c193e5546d48efb3e4ef47c1e1f2 # current, before: https://github.com/microsoft/vcpkg/releases/tag/2023.02.24
+          vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131 # https://github.com/microsoft/vcpkg/releases/tag/2023.06.20
       - name: Create build directory
         run:  mkdir build
       - name: Configure build project

diff --git a/vcpkg_full.json b/vcpkg_full.json
@@ -1,7 +1,7 @@
 {
   "name": "libosmscout",
   "version-string": "1.1.0",
-  "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7",
+  "builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
   "dependencies": [
     "zlib",
     "libiconv",

diff --git a/vcpkg_medium.json b/vcpkg_medium.json
@@ -1,7 +1,7 @@
 {
   "name": "libosmscout",
   "version-string": "1.1.0",
-  "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7",
+  "builtin-baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131",
   "dependencies": [
     "zlib",
     "libiconv",

diff --git a/vcpkg_minimum.json b/vcpkg_minimum.json
@@ -1,7 +1,7 @@
 {
   "name": "libosmscout",
   "version-string": "1.1.0",
-  "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7",
+  "builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
   "dependencies": [
     "zlib",
     "libiconv",