From 89bee30d1e7c4240cc5e62d169b8573baa9a2d0d Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 19 Nov 2024 08:42:06 +1300 Subject: [PATCH 1/2] CICD: Update the Runner for macOS to macos-13. Signed-off-by: Michael Keller --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 632606a56..b3f4c9a7b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -15,7 +15,7 @@ on: jobs: build: - runs-on: macOS-12 + runs-on: macOS-13 steps: - name: checkout sources uses: actions/checkout@v4 From 73be9c4a5aac94acf6e096c58ee29e4c89e4c864 Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Tue, 19 Nov 2024 11:17:17 +1300 Subject: [PATCH 2/2] Update dependency versions, switch the Google maps plugin to upstream. Signed-off-by: Michael Keller --- scripts/get-dep-lib.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index ec261d46f..6ca149319 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -15,9 +15,10 @@ CURRENT_LIBXML2="v2.9.4" CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72" CURRENT_KIRIGAMI="v5.76.0" CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02" +CURRENT_GOOGLEMAPS="master" CURRENT_MDBTOOLS="v1.0.0" -CURRENT_QT_ANDROID_CMAKE="master" -CURRENT_LIBMTP="master" +CURRENT_QT_ANDROID_CMAKE="fa363d60e389afbcd56c31ab4dd9723708b79fbe" +CURRENT_LIBMTP="d578ba117e4a6f4de666e22c4ea380c2c0befea1" # Checkout library from git # Ensure specified version is checked out, @@ -169,7 +170,7 @@ for package in "${PACKAGES[@]}" ; do git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git ;; googlemaps) - git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git + git_checkout_library googlemaps $CURRENT_GOOGLEMAPS https://github.com/Subsurface/googlemaps.git ;; hidapi) git_checkout_library hidapi master https://github.com/libusb/hidapi.git