Skip to content
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
13 changes: 2 additions & 11 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
ARTIFACT: QGroundControl.dmg
PACKAGE: QGroundControl
QT_VERSION: 6.8.1
GST_VERSION: 1.24.12
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules

steps:
Expand All @@ -52,17 +51,9 @@ jobs:
with:
xcode-version: latest-stable

- name: Install Dependencies
- name: Install Dependencies (include GStreamer)
working-directory: ${{ github.workspace }}/tools/setup
run: sh macos-dependencies.sh

- name: Install GStreamer
run: |
wget --quiet https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.GST_VERSION }}/gstreamer-1.0-devel-${{ env.GST_VERSION }}-universal.pkg
wget --quiet https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.GST_VERSION }}/gstreamer-1.0-${{ env.GST_VERSION }}-universal.pkg
for package in *.pkg ;
do sudo installer -verbose -pkg "$package" -target /
done
run: sh install-dependencies-osx.sh

- name: Setup Caching
uses: ./.github/actions/cache
Expand Down
26 changes: 26 additions & 0 deletions tools/setup/install-dependencies-osx.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#! /usr/bin/env bash

if ! command -v brew &> /dev/null
then
# install Homebrew if not installed yet
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
eval "$(/usr/local/bin/brew shellenv)"
fi

brew update
brew install cmake ninja ccache git pkgconf create-dmg

# Install GStreamer
GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx
GST_VERSION=1.24.12
GST_PKG=gstreamer-1.0-$GST_VERSION-universal.pkg
GST_DEV_PKG=gstreamer-1.0-devel-$GST_VERSION-universal.pkg
pushd $TMPDIR
curl -O $GST_URL/$GST_VERSION/$GST_DEV_PKG
curl -O $GST_URL/$GST_VERSION/$GST_PKG
echo "Sudo may be required to install GStreamer"
sudo installer -pkg "$GST_PKG" -target /
sudo installer -pkg "$GST_DEV_PKG" -target /
rm $TMPDIR/$GST_DEV_PKG
rm $TMPDIR/$GST_PKG
popd
11 changes: 0 additions & 11 deletions tools/setup/macos-dependencies.sh

This file was deleted.

Loading