Skip to content

Commit

Permalink
chore: Update build
Browse files Browse the repository at this point in the history
- Update vcpkg dependency version
- Removed Ubuntu 22.04 builds
  • Loading branch information
Framstag committed Dec 29, 2024
1 parent 66bfe33 commit 014189a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 85 deletions.
80 changes: 0 additions & 80 deletions .github/workflows/build_and test_on_ubuntu_22_04.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/build_and test_on_vs2022.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
uses: lukka/run-vcpkg@v11.5
with:
runVcpkgInstall: false
vcpkgJsonGlob: '**/vcpkg.json'
vcpkgGitCommitId: f6a5d4e8eb7476b8d7fc12a56dff300c1c986131 # https://github.com/microsoft/vcpkg/releases/tag/2023.06.20
vcpkgGitCommitId: b322364f06308bdd24823f9d8f03fe0cc86fd46f # https://github.com/microsoft/vcpkg/releases/tag/2024.12.16
- name: Create build directory
run: mkdir build
- name: Configure build project
Expand Down
2 changes: 1 addition & 1 deletion vcpkg_full.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libosmscout",
"version-string": "1.1.0",
"builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"dependencies": [
"catch2",
"zlib",
Expand Down
2 changes: 1 addition & 1 deletion vcpkg_medium.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libosmscout",
"version-string": "1.1.0",
"builtin-baseline": "f6a5d4e8eb7476b8d7fc12a56dff300c1c986131",
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"dependencies": [
"catch2",
"zlib",
Expand Down
2 changes: 1 addition & 1 deletion vcpkg_minimum.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libosmscout",
"version-string": "1.1.0",
"builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1",
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"dependencies": [
"catch2",
"zlib",
Expand Down

0 comments on commit 014189a

Please sign in to comment.