From 90636e8c2f85d4edc695b8111be43c12df6a6843 Mon Sep 17 00:00:00 2001 From: Stefan Kebekus Date: Tue, 8 Oct 2024 07:52:14 +0200 Subject: [PATCH] Update actions --- .github/workflows/android.yml | 38 +++++++++++++++++++++++------------ .github/workflows/ios.yml | 9 +++++++++ .github/workflows/linux.yml | 10 +++++++++ .github/workflows/macos.yml | 9 +++++++++ .github/workflows/sources.yml | 9 +++++++++ .github/workflows/windows.yml | 9 +++++++++ 6 files changed, 71 insertions(+), 13 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e4a30b0..feada72 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -3,50 +3,62 @@ name: Compile on Android on: push: branches: [ main ] + paths-ignore: + - ".gitignore" + - "README.md" + # ignore CI for other platforms + - ".github/workflows/ios.yml" + - ".github/workflows/linux.yml" + - ".github/workflows/macos.yml" + - ".github/workflows/sources.yml" + - ".github/workflows/windows.yml" jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 with: + fetch-depth: 0 submodules: recursive - - name: Install Qt for Desktop - uses: jurplel/install-qt-action@v3 - with: - cache: 'true' - cache-key-prefix: 'install-qt-action-host' - version: '6.6.*' - name: Set QT_HOST_PATH run: | echo QT_HOST_PATH=$Qt6_DIR >> $GITHUB_ENV - name: Install Qt for Android arm64 - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: + aqtversion: ==3.1.* cache: 'true' cache-key-prefix: 'install-qt-action-android' modules: 'qtlocation qtpositioning' target: 'android' - version: '6.6.*' + version: '6.7.*' arch: 'android_arm64_v8a' + - name: Set up OpenJDK 17 + uses: actions/setup-java@v4 + with: + distribution: adopt + java-version: 17 + - name: Setup ninja + uses: seanmiddleditch/gha-setup-ninja@v5 - name: Install Additional Software run: | - sudo apt install ninja-build - echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "platform-tools" "build-tools;33.0.2" - echo ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.1.8937393 >> $GITHUB_ENV + echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" "platform-tools" "build-tools;34.0.0" + echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;26.1.10909125" + echo ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/26.1.10909125 >> $GITHUB_ENV - name: Remove Unwanted Software run: | echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-33-ext4" "platforms;android-33-ext5" "platforms;android-34-ext8" - echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;25.1.8937393" - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: key: android - name: Compile and Install libzip run: | + export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../gcc_64")" $Qt6_DIR/bin/qt-cmake \ -G Ninja \ -S libzip \ diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 71d1df4..944a121 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -3,6 +3,15 @@ name: Compile on iOS on: push: branches: [ main ] + paths-ignore: + - ".gitignore" + - "README.md" + # ignore CI for other platforms + - ".github/workflows/android.yml" + - ".github/workflows/linux.yml" + - ".github/workflows/macos.yml" + - ".github/workflows/sources.yml" + - ".github/workflows/windows.yml" jobs: build: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 96f814a..3d53e95 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,6 +3,15 @@ name: Compile on Linux on: push: branches: [ main ] + paths-ignore: + - ".gitignore" + - "README.md" + # ignore CI for other platforms + - ".github/workflows/android.yml" + - ".github/workflows/ios.yml" + - ".github/workflows/macos.yml" + - ".github/workflows/sources.yml" + - ".github/workflows/windows.yml" jobs: build: @@ -13,6 +22,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: + fetch-depth: 0 submodules: recursive - name: Install Qt uses: jurplel/install-qt-action@v3 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 99a8d5b..0e7cf51 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,6 +3,15 @@ name: Compile on macOS on: push: branches: [ main ] + paths-ignore: + - ".gitignore" + - "README.md" + # ignore CI for other platforms + - ".github/workflows/android.yml" + - ".github/workflows/ios.yml" + - ".github/workflows/linux.yml" + - ".github/workflows/sources.yml" + - ".github/workflows/windows.yml" jobs: build: diff --git a/.github/workflows/sources.yml b/.github/workflows/sources.yml index 1ce160e..9ec8976 100644 --- a/.github/workflows/sources.yml +++ b/.github/workflows/sources.yml @@ -3,6 +3,15 @@ name: Sources on: push: branches: [ main ] + paths-ignore: + - ".gitignore" + - "README.md" + # ignore CI for other platforms + - ".github/workflows/android.yml" + - ".github/workflows/ios.yml" + - ".github/workflows/linux.yml" + - ".github/workflows/macos.yml" + - ".github/workflows/windows.yml" jobs: build: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e6f9ebf..b81f987 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,6 +3,15 @@ name: Compile on Windows on: push: branches: [ feature/actions ] + paths-ignore: + - ".gitignore" + - "README.md" + # ignore CI for other platforms + - ".github/workflows/android.yml" + - ".github/workflows/ios.yml" + - ".github/workflows/linux.yml" + - ".github/workflows/macos.yml" + - ".github/workflows/sources.yml" jobs: build: