Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment Updates #12329

Merged
merged 1 commit into from
Jan 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
BasedOnStyle: Google
AccessModifierOffset: -4
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortLambdasOnASingleLine: Inline
BinPackArguments: false
BinPackParameters: false
ColumnLimit: 120
IncludeBlocks: Preserve
IndentWidth: 4
Language: Cpp
PackConstructorInitializers: Never
PenaltyBreakAssignment: 80
SortIncludes: true
SpacesBeforeTrailingComments: 1
Standard: c++17
39 changes: 39 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
Checks: >
clang-diagnostic-*,
clang-analyzer-*,
bugprone-*,
cppcoreguidelines-*,
google-*,
llvm-*,
misc-*,
modernize-*,
performance-*,
portability-*,
readability-*,
-bugprone-easily-swappable-parameters,
-cppcoreguidelines-avoid-c-arrays,
-cppcoreguidelines-avoid-const-or-ref-data-members,
-cppcoreguidelines-avoid-non-const-global-variables,
-cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-pro-type-reinterpret-cast,
-cppcoreguidelines-pro-type-static-cast-downcast,
-cppcoreguidelines-pro-type-vararg,
-cppcoreguidelines-special-member-functions,
-google-readability-todo,
-llvm-header-guard,
-llvm-include-order,
-misc-include-cleaner,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
-misc-use-internal-linkage,
-modernize-avoid-c-arrays,
-modernize-use-trailing-return-type,
-readability-convert-member-functions-to-static,
-readability-function-cognitive-complexity,
-readability-identifier-length,
-readability-redundant-access-specifiers,
-readability-uppercase-literal-suffix
WarningsAsErrors: '*'
HeaderFilterRegex: '^((?!vendor).)*$'
...
3 changes: 3 additions & 0 deletions .cmake-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
format:
tab_size: 4
line_width: 100
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
charset = utf-8
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace=true
9 changes: 0 additions & 9 deletions .github/actions/qt-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ runs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.version }}
aqtversion: ==3.1.*
host: ${{ inputs.host }}
target: desktop
arch: ${{ inputs.arch }}
Expand All @@ -76,12 +75,10 @@ runs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.version }}
aqtversion: ==3.1.*
host: ${{ inputs.host }}
target: android
arch: android_armv7
dir: ${{ runner.temp }}
extra: --autodesktop
modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

Expand All @@ -90,12 +87,10 @@ runs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.version }}
aqtversion: ==3.1.*
host: ${{ inputs.host }}
target: android
arch: android_arm64_v8a
dir: ${{ runner.temp }}
extra: --autodesktop
modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

Expand All @@ -104,12 +99,10 @@ runs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.version }}
aqtversion: ==3.1.*
host: ${{ inputs.host }}
target: android
arch: android_x86
dir: ${{ runner.temp }}
extra: --autodesktop
modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

Expand All @@ -118,11 +111,9 @@ runs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.version }}
aqtversion: ==3.1.*
host: ${{ inputs.host }}
target: android
arch: android_x86_64
dir: ${{ runner.temp }}
extra: --autodesktop
modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: 2

updates:
- package-ecosystem: github-actions
directory: /
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:
- '.github/workflows/android-linux.yml'
- 'deploy/android/**'
- 'src/**'
- 'CMakeLists.txt'

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/android-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
workflow_dispatch:

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand Down Expand Up @@ -44,7 +43,7 @@ jobs:
- name: Install Dependencies
run: |
brew update
brew install cmake ninja ccache
brew install ccache
continue-on-error: true

- name: Install Qt for Android
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/android-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:
- '.github/workflows/android-windows.yml'
- 'deploy/android/**'
- 'src/**'
- 'CMakeLists.txt'

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand All @@ -32,6 +32,7 @@ jobs:

env:
ARTIFACT: QGroundControl.apk
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
GST_VERSION: 1.22.12
QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
Expand All @@ -50,7 +51,9 @@ jobs:

- uses: seanmiddleditch/gha-setup-ninja@v5
- uses: lukka/get-cmake@latest
- uses: mozilla-actions/[email protected]

- name: Update ccache
run: choco install ccache

- name: Install Qt for Android
uses: ./.github/actions/qt-android
Expand Down Expand Up @@ -85,5 +88,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
19 changes: 4 additions & 15 deletions .github/workflows/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ on:
- 'v*'
pull_request:
paths:
- '.github/workflows/custom.yml'
- 'deploy/windows/**'
- 'src/**'
- 'custom-example/**'
- 'deploy/windows/**'
- 'CMakeLists.txt'

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand Down Expand Up @@ -55,23 +56,12 @@ jobs:
- uses: seanmiddleditch/gha-setup-ninja@v5
- uses: lukka/get-cmake@latest

# - name: Install Vulkan
# working-directory: ${{ runner.temp }}
# shell: pwsh
# run: |
# Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-sdk.exe" -OutFile vulkan-sdk.exe
# .\vulkan-sdk.exe --root C:\VulkanSDK\latest --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.glm com.lunarg.vulkan.volk com.lunarg.vulkan.vma com.lunarg.vulkan.debug
# echo "VULKAN_SDK=C:\VulkanSDK\latest" >> $env:GITHUB_ENV

- name: Install GStreamer
uses: blinemedical/setup-gstreamer@v1
with:
version: ${{ env.GST_VERSION }}

# - name: Install Gstreamer
# run: choco install --no-progress gstreamer gstreamer-devel --version=${{ env.GST_VERSION }}

- name: Set Up sccache
- name: Set Up SCCache
uses: mozilla-actions/[email protected]

- name: Set Up Cache
Expand All @@ -82,7 +72,6 @@ jobs:
variant: sccache
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
verbose: 1
evict-old-files: 'job'

- name: Install Qt for Windows (x64)
if: matrix.Arch == 'x64'
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 @@ -12,6 +12,7 @@ on:
- 'src/**'
- 'deploy/docker/**'
- 'deploy/linux/**'
- 'CMakeLists.txt'

concurrency:
# cancel jobs on PRs only
Expand Down
21 changes: 2 additions & 19 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
workflow_dispatch:

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand All @@ -27,17 +26,6 @@ jobs:
GST_VERSION: 1.22.12

steps:
- name: Recover disk space
run: |
df -h
ls /Applications
brew uninstall google-chrome
sudo rm -rf /Users/runner/Library/Android
sudo rm -rf /Applications/Xcode_14*
sudo rm -rf /Applications/Xcode_15*
ls /Applications
df -h

- name: Checkout repo
uses: actions/checkout@v4
with:
Expand All @@ -51,14 +39,12 @@ jobs:
xcode-version: latest-stable

- uses: seanmiddleditch/gha-setup-ninja@v5
- uses: lukka/get-cmake@latest

- name: Install Dependencies
run: |
brew update
brew install cmake ninja ccache

- uses: seanmiddleditch/gha-setup-ninja@v5
- uses: lukka/get-cmake@latest
brew install ccache

- name: Set Up Cache
uses: hendrikmuhs/ccache-action@main
Expand All @@ -74,7 +60,6 @@ jobs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
aqtversion: ==3.1.*
host: mac
target: desktop
arch: clang_64
Expand All @@ -86,12 +71,10 @@ jobs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
aqtversion: ==3.1.*
host: mac
target: ios
arch: ios
dir: ${{ runner.temp }}
extra: --autodesktop
modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:
- '.github/workflows/linux.yml'
- 'deploy/linux/**'
- 'src/**'
- 'CMakeLists.txt'

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand Down Expand Up @@ -49,7 +49,9 @@ jobs:
run: |
chmod a+x ./tools/setup/install-dependencies-debian.sh
sudo ./tools/setup/install-dependencies-debian.sh
python3 -m pip install --user ninja cmake

- uses: lukka/get-cmake@latest
- uses: seanmiddleditch/gha-setup-ninja@v5

- name: Install Vulkan
run: |
Expand Down Expand Up @@ -86,7 +88,6 @@ jobs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
aqtversion: ==3.1.*
host: linux
target: desktop
arch: linux_gcc_64
Expand All @@ -97,9 +98,6 @@ jobs:
# - name: Build GStreamer
# uses: ./.github/actions/gstreamer

- uses: lukka/get-cmake@latest
- uses: seanmiddleditch/gha-setup-ninja@v5

- run: mkdir ${{ runner.temp }}/shadow_build_dir

- name: Configure
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:
- '.github/workflows/macos.yml'
- 'deploy/macos/**'
- 'src/**'
- 'CMakeLists.txt'

concurrency:
# cancel jobs on PRs only
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

Expand Down Expand Up @@ -70,6 +70,7 @@ jobs:
- name: Set Up Cache
uses: hendrikmuhs/ccache-action@main
with:
create-symlink: true
key: ${{ runner.os }}-${{ matrix.BuildType }}
max-size: 1G
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
Expand All @@ -80,7 +81,6 @@ jobs:
uses: jurplel/install-qt-action@v4
with:
version: ${{ env.QT_VERSION }}
aqtversion: ==3.1.*
host: mac
target: desktop
arch: clang_64
Expand Down
Loading
Loading