Skip to content

Commit

Permalink
Merge branch 'master' into fix-gstreamer-paths-arch-linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Aram-Vn authored Feb 12, 2025
2 parents 1f21260 + c037eb6 commit f87751b
Show file tree
Hide file tree
Showing 35 changed files with 283 additions and 329 deletions.
24 changes: 24 additions & 0 deletions .github/actions/checks/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Source Checks
description: Run Various Checks on Source
inputs:
format:
description: Run Clang Format
default: 'false'
spelling:
description: Run Spelling
default: 'false'
runs:
using: "composite"
steps:
- uses: actions/checkout@v4

- name: Run clang-format style check for C++ Source Files.
if: inputs.format == 'true'
uses: jidicula/clang-format-action@main
with:
clang-format-version: '17'
check-path: 'src'

- name: Check spelling
if: inputs.spelling == 'true'
uses: crate-ci/typos@master
2 changes: 1 addition & 1 deletion .github/actions/qt-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inputs:
version:
description: Qt Version
required: false
default: 6.8.1
default: 6.8.2
abis:
description: ABIs to Build
required: false
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/android-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'src/**'
- 'android/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -34,7 +35,7 @@ jobs:
env:
ARTIFACT: QGroundControl.apk
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
Expand Down
19 changes: 16 additions & 3 deletions .github/workflows/android-macos.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
name: Android-MacOS

on:
workflow_dispatch:
push:
branches:
- master
- 'Stable*'
tags:
- 'v*'
pull_request:
paths:
- '.github/workflows/android-macos.yml'
- 'deploy/android/**'
- 'src/**'
- 'android/**'
- 'CMakeLists.txt'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -21,7 +33,8 @@ jobs:

env:
ARTIFACT: QGroundControl.apk
QT_VERSION: 6.8.1
PACKAGE: QGroundControl
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
Expand Down Expand Up @@ -66,5 +79,5 @@ jobs:
- name: Save APK
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT }}
name: ${{ env.PACKAGE }}
path: ${{ runner.temp }}/shadow_build_dir/android-build/*.apk
3 changes: 2 additions & 1 deletion .github/workflows/android-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'src/**'
- 'android/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -34,7 +35,7 @@ jobs:
env:
ARTIFACT: QGroundControl.apk
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/clang-format-check.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'src/**'
- 'custom-example/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -34,7 +35,7 @@ jobs:

env:
ARTIFACT: QGroundControl-installer.exe
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'deploy/linux/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
env:
ARTIFACT: QGroundControl.app
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'src/**'
- 'test/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -35,7 +36,7 @@ jobs:
env:
ARTIFACT: QGroundControl-x86_64.AppImage
PACKAGE: QGroundControl-x86_64
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- 'deploy/macos/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -33,7 +34,7 @@ jobs:
env:
ARTIFACT: QGroundControl.dmg
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2

steps:
- name: Checkout repo
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/spelling.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- 'deploy/windows/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -34,7 +35,7 @@ jobs:
env:
ARTIFACT: QGroundControl-installer.exe
PACKAGE: QGroundControl-installer
QT_VERSION: 6.8.1
QT_VERSION: 6.8.2
GST_VERSION: 1.22.12

steps:
Expand Down
Loading

0 comments on commit f87751b

Please sign in to comment.