-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'mavlink:master' into master
- Loading branch information
Showing
163 changed files
with
5,573 additions
and
3,628 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: Publish Android Build to Play Store | ||
| description: Checks out the QGC repo with all the correct settings | ||
| inputs: | ||
| artifact: | ||
| description: Build File To Upload | ||
| required: true | ||
| service_account_json: | ||
| description: The service account json private key file to authorize the upload request | ||
| required: true | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Deploy to Play Store | ||
| if: ${{ github.event_name != 'pull_request' && github.ref_name == 'master' }} | ||
| uses: r0adkll/upload-google-play@v1 | ||
| with: | ||
| serviceAccountJsonPlainText: ${{ inputs.service_account_json }} | ||
| packageName: com.mavlink.qgroundcontrol | ||
| releaseFiles: ${{ inputs.artifact }} | ||
| track: production | ||
| status: completed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,11 +36,13 @@ jobs: | |
| env: | ||
| ARTIFACT: QGroundControl-x86_64.AppImage | ||
| QT_VERSION: 6.6.3 | ||
| # GST_VERSION: 1.22.12 | ||
| GST_VERSION: 1.22.12 | ||
|
|
||
| steps: | ||
| - name: Free Disk Space (Ubuntu) | ||
| uses: jlumbroso/free-disk-space@main | ||
| with: | ||
| large-packages: false | ||
| continue-on-error: true | ||
|
|
||
| - name: Checkout repo | ||
|
|
@@ -56,8 +58,6 @@ jobs: | |
| sudo ./tools/setup/install-dependencies-debian.sh | ||
| python3 -m pip install --user ninja cmake | ||
| - uses: lukka/get-cmake@latest | ||
|
|
||
| - name: Install Vulkan | ||
| run: | | ||
| wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - | ||
|
|
@@ -79,8 +79,6 @@ jobs: | |
| cd ccache-*-linux-x86_64 | ||
| sudo make install | ||
| - uses: seanmiddleditch/gha-setup-ninja@v5 | ||
|
|
||
| - name: Set Up Cache | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
|
|
@@ -106,6 +104,65 @@ jobs: | |
| # - name: Build GStreamer | ||
| # uses: ./.github/actions/gstreamer | ||
|
|
||
| - name: Install GStreamer | ||
| uses: blinemedical/setup-gstreamer@v1 | ||
| with: | ||
| version: ${{ env.GST_VERSION }} | ||
| # gstreamerOptions: | | ||
| # --buildtype=release | ||
| # --wrap-mode=forcefallback | ||
| # --strip | ||
| # -Dauto_features=disabled | ||
| # -Dbase=enabled | ||
| # -Ddoc=disabled | ||
| # -Dexamples=disabled | ||
| # -Dges=disabled | ||
| # -Dgpl=enabled | ||
| # -Dgst-examples=disabled | ||
| # -Dgtk_doc=disabled | ||
| # -Dlibav=enabled | ||
| # -Dlibnice=disabled | ||
| # -Dnls=disabled | ||
| # -Dorc=enabled | ||
| # -Dpython=disabled | ||
| # -Dqt5=disabled | ||
| # -Drtsp_server=disabled | ||
| # -Dtests=disabled | ||
| # -Dgst-plugins-base:app=enabled | ||
| # -Dgst-plugins-base:gl=enabled | ||
| # -Dgst-plugins-base:gl_api=opengl,gles2 | ||
| # -Dgst-plugins-base:gl_platform=glx,egl | ||
| # -Dgst-plugins-base:gl_winsys=x11,egl,wayland | ||
| # -Dgst-plugins-base:playback=enabled | ||
| # -Dgst-plugins-base:tcp=enabled | ||
| # -Dgst-plugins-base:x11=enabled | ||
| # -Dgood=enabled | ||
| # -Dgst-plugins-good:isomp4=enabled | ||
| # -Dgst-plugins-good:matroska=enabled | ||
| # -Dgst-plugins-good:qt-egl=enabled | ||
| # -Dgst-plugins-good:qt-method=auto | ||
| # -Dgst-plugins-good:qt-wayland=enabled | ||
| # -Dgst-plugins-good:qt-x11=enabled | ||
| # -Dgst-plugins-good:rtp=enabled | ||
| # -Dgst-plugins-good:rtpmanager=enabled | ||
| # -Dgst-plugins-good:rtsp=enabled | ||
| # -Dgst-plugins-good:udp=enabled | ||
| # -Dbad=enabled | ||
| # -Dgst-plugins-bad:gl=enabled | ||
| # -Dgst-plugins-bad:mpegtsdemux=enabled | ||
| # -Dgst-plugins-bad:rtp=enabled | ||
| # -Dgst-plugins-bad:sdp=enabled | ||
| # -Dgst-plugins-bad:videoparsers=enabled | ||
| # -Dgst-plugins-bad:wayland=enabled | ||
| # -Dgst-plugins-bad:x11=enabled | ||
| # -Dgst-plugins-bad:x265=enabled | ||
| # -Dugly=enabled | ||
| # -Dgst-plugins-ugly:x264=enabled | ||
|
|
||
| - uses: lukka/get-cmake@latest | ||
|
|
||
| - uses: seanmiddleditch/gha-setup-ninja@v5 | ||
|
|
||
| - run: mkdir ${{ runner.temp }}/shadow_build_dir | ||
|
|
||
| - name: Configure | ||
|
|
@@ -138,3 +195,4 @@ jobs: | |
| aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| source: '' | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,7 +56,8 @@ jobs: | |
| - name: Install Dependencies | ||
| run: | | ||
| brew update | ||
| brew install cmake ninja ccache geographiclib SDL2 exiv2 expat zlib shapelib | ||
| brew install cmake ninja ccache geographiclib SDL2 exiv2 expat zlib shapelib pkgconfig | ||
| # pkgconf | ||
|
|
||
| - name: Install Gstreamer | ||
| run: | | ||
|
|
@@ -65,7 +66,7 @@ jobs: | |
| for package in *.pkg ; | ||
| do sudo installer -verbose -pkg "$package" -target / | ||
| done | ||
| echo "PKG_CONFIG_PATH=/Library/Frameworks/GStreamer.framework/lib/pkgconfig:${{ env.PKG_CONFIG_PATH }}" >> "$GITHUB_ENV" | ||
| echo "PKG_CONFIG_PATH=/Library/Frameworks/GStreamer.framework/lib/pkgconfig:/Library/Frameworks/GStreamer.framework/lib/gstreamer-1.0/pkgconfig:${{ env.PKG_CONFIG_PATH }}" >> "$GITHUB_ENV" | ||
| - name: Set Up Cache | ||
| uses: hendrikmuhs/[email protected] | ||
|
|
@@ -114,3 +115,4 @@ jobs: | |
| aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| source: 'package' | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.