Skip to content

Commit 242e6a5

Browse files
authored
Merge pull request #1634 from Framstag/update-vscode-dependencies
chore: Update build
2 parents 66bfe33 + 014189a commit 242e6a5

File tree

5 files changed

+5
-85
lines changed

5 files changed

+5
-85
lines changed

.github/workflows/build_and test_on_ubuntu_22_04.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

.github/workflows/build_and test_on_vs2022.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
# Restore from cache the previously built ports. If cache-miss, download and build vcpkg (aka "bootstrap vcpkg").
2525
- name: Restore from cache and install vcpkg
2626
# Download and build vcpkg, without installing any port. If content is cached already, it is a no-op.
27-
uses: lukka/run-vcpkg@v11.4
27+
uses: lukka/run-vcpkg@v11.5
2828
with:
2929
runVcpkgInstall: false
3030
vcpkgJsonGlob: '**/vcpkg.json'
31-
vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131 # https://github.com/microsoft/vcpkg/releases/tag/2023.06.20
31+
vcpkgGitCommitId: b322364f06308bdd24823f9d8f03fe0cc86fd46f # https://github.com/microsoft/vcpkg/releases/tag/2024.12.16
3232
- name: Create build directory
3333
run: mkdir build
3434
- name: Configure build project

vcpkg_full.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "libosmscout",
33
"version-string": "1.1.0",
4-
"builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
4+
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
55
"dependencies": [
66
"catch2",
77
"zlib",

vcpkg_medium.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "libosmscout",
33
"version-string": "1.1.0",
4-
"builtin-baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131",
4+
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
55
"dependencies": [
66
"catch2",
77
"zlib",

vcpkg_minimum.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "libosmscout",
33
"version-string": "1.1.0",
4-
"builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
4+
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
55
"dependencies": [
66
"catch2",
77
"zlib",

0 commit comments

Comments
 (0)