Skip to content

Commit

Permalink
Fix After Rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
HTRamsey committed Apr 27, 2024
1 parent 6fcd62a commit 0ab127b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 17 deletions.
25 changes: 11 additions & 14 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,19 @@ on:
paths-ignore:
- 'docs/**'
- 'android/**'
- '.github/workflows/docs_deploy.yml'
- '.github/workflows/android.yml'
- '.github/workflows/linux.yml'
- '.github/workflows/macos.yml'
- '.github/workflows/windows.yml'

jobs:
build:
runs-on: macos-latest
runs-on: macos-13

strategy:
matrix:
BuildType: [Release]
BuildType: [Debug, Release]

env:
ARTIFACT: QGroundControl.app
Expand All @@ -34,16 +39,6 @@ jobs:
submodules: recursive
fetch-tags: true

- name: Set up Cache
uses: hendrikmuhs/[email protected]
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
with:
create-symlink: true
key: ${{ runner.os }}-${{ matrix.BuildType }}
restore-keys: ${{ runner.os }}-${{ matrix.BuildType }}
max-size: 1G
append-timestamp: false

- uses: actions/checkout@v4
with:
repository: jurplel/install-qt-action
Expand Down Expand Up @@ -72,6 +67,7 @@ jobs:
dir: ${{ runner.temp }}
modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d
cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
tools: 'tools_cmake'

- name: Install Qt6 for iOS
uses: ./install-qt-action/action/
Expand All @@ -85,7 +81,9 @@ jobs:
cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}

- name: Install Dependencies
run: brew install ninja
run: |
brew update
brew install ninja
- name: Create build directory
run: mkdir ${{ runner.temp }}/shadow_build_dir
Expand All @@ -95,7 +93,6 @@ jobs:
run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
-DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
-DQT_HOST_PATH="${{ env.QT_ROOT_DIR }}/../macos"
-DQT_DEBUG_FIND_PACKAGE=ON
-DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}

- name: Build
Expand Down
4 changes: 1 addition & 3 deletions src/comm/LinkManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@
#include "LinkInterface.h"
#include "QGCToolbox.h"
#include "QmlObjectListModel.h"
#include "UdpIODevice.h"
#ifndef NO_SERIAL_LINK
#include "QGCSerialPortInfo.h"
#ifndef __mobile__
#include "UdpIODevice.h"
#endif
#endif

#include <QtCore/QList>
Expand Down

0 comments on commit 0ab127b

Please sign in to comment.