diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ed5fba3..4d18535 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,6 +16,8 @@ jobs: - name: Install Qt for Desktop uses: jurplel/install-qt-action@v3 with: + cache: 'true' + cache-key-prefix: 'install-qt-action-host' version: '6.*.*' - name: Set QT_HOST_PATH run: | @@ -23,6 +25,8 @@ jobs: - name: Install Qt for Android uses: jurplel/install-qt-action@v3 with: + cache: 'true' + cache-key-prefix: 'install-qt-action-android' target: 'android' version: '6.*.*' arch: 'android_arm64_v8a' @@ -30,9 +34,11 @@ jobs: run: | sudo apt install doxygen graphviz librsvg2-bin 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 + - 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" - echo ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.1.8937393 >> $GITHUB_ENV - name: Configure run: | cmake -E make_directory build @@ -41,11 +47,11 @@ jobs: run: | cmake --build build cmake --build build --target apk - cp build/src/android-build/build/outputs/apk/debug/android-build-debug.apk addTimes-android.apk + cp build/src/android-build/build/outputs/apk/debug/android-build-debug.apk addTimes-android-arm64v8a.apk - uses: pyTooling/Actions/releaser@r0 with: tag: developerBuilds rm: true token: ${{ secrets.GITHUB_TOKEN }} files: | - addTimes-android.apk + addTimes-android-arm64v8a.apk diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 8ebf3fb..262fed8 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -24,7 +24,7 @@ jobs: - name: Install Qt for Desktop uses: jurplel/install-qt-action@v3 with: - version: '6.5.*' + version: '6.*.*' - name: Set QT_HOST_PATH run: | echo QT_HOST_PATH=$Qt6_DIR >> $GITHUB_ENV @@ -32,7 +32,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: target: 'ios' - version: '6.5.*' + version: '6.*.*' - name: Setup env run: | export PATH=$Qt6_DIR/bin:$PATH diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index cf645e2..e15d7ff 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,6 +16,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: + cache: 'true' version: '6.*.*' - name: Install LinuxDeploy uses: miurahr/install-linuxdeploy-action@v1 @@ -23,7 +24,7 @@ jobs: plugins: appimage - name: Install Additional Software run: | - sudo apt install appstream fuse + sudo apt install appstream fuse libxcb-cursor0 - name: Configure run: | cmake -E make_directory build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f41acce..ed58e34 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,7 +2,7 @@ name: Compile on Windows on: push: - branches: [ feature/actions ] + branches: [ feature/xxxactions ] jobs: build: