lisonwu/qgroundcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Fix Workflow Paths

Browse Source
This commit is contained in:
Holden Ramsey
2025-02-09 00:04:26 -05:00
committed by Holden Ramsey
parent 248fa2deb4
commit 8622ccb3ee
10 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/actions/cache/action.yml
-1
View File
@@ -13,7 +13,6 @@ inputs:
cpm-modules:
description: Path to CPM Modules
required: false
default: $RUNNER_TEMP/shadow_build_dir/cpm-modules
ccache-version:
description: ccache Version to Install
required: false
.github/actions/qt-android/action.yml
+2 -3
View File
@@ -15,10 +15,9 @@ inputs:
description: ABIs to Build
required: false
default: 'armeabi-v7a;arm64-v8a'
cpm-cache:
cpm-modules:
description: CPM Cache Path
required: false
default: $GITHUB_WORKSPACE/cpm_modules
runs:
using: "composite"
steps:
@@ -63,7 +62,7 @@ runs:
host: ${{ inputs.host }}
target: android
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ inputs.cpm-cache }}
cpm-modules: ${{ inputs.cpm-modules }}
- name: Install Qt for ${{ runner.os }}
uses: jurplel/install-qt-action@v4
.github/workflows/android-linux.yml
+1 -2
View File
@@ -41,7 +41,6 @@ jobs:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_ABIS: ${{ matrix.BuildType == 'Release' && 'armeabi-v7a;arm64-v8a' || 'arm64-v8a' }}
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules
steps:
- name: Checkout repo
@@ -60,7 +59,7 @@ jobs:
arch: linux_gcc_64
version: ${{ env.QT_VERSION }}
abis: ${{ env.QT_ANDROID_ABIS }}
cpm-cache: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}/shadow_build_dir/cpm_modules
- name: Configure
working-directory: ${{ runner.temp }}/shadow_build_dir
.github/workflows/android-macos.yml
+1 -2
View File
@@ -28,7 +28,6 @@ jobs:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_ABIS: 'arm64-v8a'
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules
steps:
- name: Checkout repo
@@ -47,7 +46,7 @@ jobs:
arch: clang_64
version: ${{ env.QT_VERSION }}
abis: ${{ env.QT_ANDROID_ABIS }}
cpm-cache: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}/shadow_build_dir/cpm_modules
- name: Configure
working-directory: ${{ runner.temp }}/shadow_build_dir
.github/workflows/android-windows.yml
+1 -2
View File
@@ -41,7 +41,6 @@ jobs:
QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
QT_ANDROID_ABIS: 'arm64-v8a'
CPM_SOURCE_CACHE: ${{ runner.temp }}\shadow_build_dir\cpm_modules
steps:
- name: Checkout repo
@@ -60,7 +59,7 @@ jobs:
arch: win64_msvc2022_64
version: ${{ env.QT_VERSION }}
abis: ${{ env.QT_ANDROID_ABIS }}
cpm-cache: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}\shadow_build_dir\cpm_modules
- name: Set up Visual Studio shell
uses: ilammy/msvc-dev-cmd@v1
.github/workflows/custom.yml
+1 -2
View File
@@ -36,7 +36,6 @@ jobs:
ARTIFACT: QGroundControl-installer.exe
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ runner.temp }}\shadow_build_dir\cpm_modules
steps:
- name: Checkout repo
@@ -66,7 +65,7 @@ jobs:
host: windows
target: win64_msvc2022_64
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}/shadow_build_dir/cpm_modules
- name: Install Qt for Windows (x64)
if: matrix.Arch == 'x64'
.github/workflows/ios.yml
+1 -2
View File
@@ -24,7 +24,6 @@ jobs:
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules
steps:
- name: Checkout repo
@@ -47,7 +46,7 @@ jobs:
host: mac
target: ios
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}/shadow_build_dir/cpm_modules
- name: Install Qt for MacOS
uses: jurplel/install-qt-action@v4
.github/workflows/linux.yml
+1 -2
View File
@@ -37,7 +37,6 @@ jobs:
PACKAGE: QGroundControl-x86_64
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules
steps:
- name: Checkout repo
@@ -74,7 +73,7 @@ jobs:
host: linux
target: linux_gcc_64
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}/shadow_build_dir/cpm_modules
- name: Install Qt for Linux (x64)
uses: jurplel/install-qt-action@v4
.github/workflows/macos.yml
+1 -2
View File
@@ -34,7 +34,6 @@ jobs:
ARTIFACT: QGroundControl.dmg
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
CPM_SOURCE_CACHE: ${{ runner.temp }}/shadow_build_dir/cpm_modules
steps:
- name: Checkout repo
@@ -61,7 +60,7 @@ jobs:
host: mac
target: clang_64
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}/shadow_build_dir/cpm_modules
- name: Install Qt
uses: jurplel/install-qt-action@v4
.github/workflows/windows.yml
+1 -2
View File
@@ -36,7 +36,6 @@ jobs:
PACKAGE: QGroundControl-installer
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
CPM_SOURCE_CACHE: ${{ runner.temp }}\shadow_build_dir\cpm_modules
steps:
- name: Checkout repo
@@ -67,7 +66,7 @@ jobs:
host: windows
target: win64_msvc2022_64
build-type: ${{ matrix.BuildType }}
cpm-modules: ${{ env.CPM_SOURCE_CACHE }}
cpm-modules: ${{ runner.temp }}\shadow_build_dir\cpm_modules
- name: Install Qt for Windows (x64)
uses: jurplel/install-qt-action@v4