Skip to content

Commit

Permalink
fix: broken Visual Studio build with meson
Browse files Browse the repository at this point in the history
- Update to Visual Studio 2022
- Update to newer Android NDK
  • Loading branch information
Framstag committed Nov 16, 2024
1 parent d6bc10e commit 1c9de31
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Visual Studio 2019
name: Visual Studio 2022

on:
pull_request:
Expand All @@ -13,7 +13,7 @@ on:
jobs:
build_cmake:
name: cmake
runs-on: windows-2019
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Create build directory
run: mkdir build
- name: Configure build project
run: cmake -G "Visual Studio 16 2019" -A x64 -DOSMSCOUT_BUILD_DOC_API=OFF -DCMAKE_SYSTEM_VERSION=10.0.18362.0 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake -Wno-dev ..
run: cmake -G "Visual Studio 17 2022" -A x64 -DOSMSCOUT_BUILD_DOC_API=OFF -DCMAKE_SYSTEM_VERSION=10.0.18362.0 -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake -Wno-dev ..
working-directory: build
- name: Build project
run: cmake --build build
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

build_meson:
name: meson
runs-on: windows-2019
runs-on: windows-2022
defaults:
run:
shell: cmd
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/build_on_ubuntu_22_04_qt_android.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Ubuntu 22.04 for Qt on Android
name: Ubuntu 24.04 for Qt on Android

# See https://doc.qt.io/qt-5/android-getting-started.html
# See https://github.com/jurplel/install-qt-action
# See https://github.com/miurahr/aqtinstall/
# See https://groups.google.com/g/android-ndk-announce?hl=de for released Android NDK versions

on:
pull_request:
Expand All @@ -17,7 +18,7 @@ on:
jobs:
build:
name: Ubuntu+android - Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -29,7 +30,7 @@ jobs:
- name: Setup Android SDK
uses: android-actions/setup-android@v3
with:
packages: "platform-tools platforms;android-34 build-tools;34.0.0 ndk;26.3.11579264"
packages: "platform-tools platforms;android-34 build-tools;34.0.0 ndk;27.2.12479018"
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
Expand All @@ -47,8 +48,8 @@ jobs:
run: ls -l ../Qt/5.15.2/android/
- name: Configure build project
run: "cmake -B build
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_HOME}/ndk/26.3.11579264/build/cmake/android.toolchain.cmake
-DANDROID_NDK=${ANDROID_HOME}/ndk/26.3.11579264/
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_HOME}/ndk/27.2.12479018/build/cmake/android.toolchain.cmake
-DANDROID_NDK=${ANDROID_HOME}/ndk/27.2.12479018/
-DANDROID_ABI=arm64-v8a
-DANDROID_PLATFORM=android-34
-DANDROID_STL=c++_shared
Expand Down

0 comments on commit 1c9de31

Please sign in to comment.