Skip to content

Commit

Permalink
Set different Homebrew paths for Github and Cirrus CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
hipersayanX committed May 1, 2023
1 parent fbd7730 commit 096846c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
1 change: 1 addition & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ mac_task:
UPLOAD: 0
env:
NJOBS: 4
HOMEBREW_PATH: /opt/homebrew
macos_instance:
cpu: 2
memory: 4G
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Mac
on: [push, pull_request]

env:
HOMEBREW_PATH: /usr/local
NJOBS: 4

jobs:
Expand All @@ -13,27 +14,14 @@ jobs:
matrix:
include:
- os: macos-13
architecture: x64
upload: 0
- os: macos-12
architecture: x64
upload: 0
- os: macos-11
architecture: x64
upload: 1
# - os: macos-13
# architecture: arm64
# upload: 0
# - os: macos-12
# architecture: arm64
# upload: 0
# - os: macos-11
# architecture: arm64
# upload: 1
runs-on: ${{ matrix.os }}
env:
UPLOAD: ${{ matrix.upload }}
ARCHITECTURE: ${{ matrix.architecture }}
steps:
- uses: actions/checkout@v2
- name: Install dependencies
Expand Down
14 changes: 4 additions & 10 deletions ports/ci/mac/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,10 @@ if [ "${UPLOAD}" == 1 ]; then
EXTRA_PARAMS="${EXTRA_PARAMS} -DNOGSTREAMER=ON -DNOJACK=ON -DNOLIBUVC=ON -DNOPULSEAUDIO=ON"
fi

if [ "${ARCHITECTURE}" == arm64 ]; then
EXTRA_PARAMS="${EXTRA_PARAMS} -DCMAKE_OSX_ARCHITECTURES=arm64"
export CFLAGS="-arch arm64"
export CXXFLAGS="-arch arm64"
fi

export PATH="/usr/local/opt/qt@5/bin:$PATH"
export LDFLAGS="$LDFLAGS -L/usr/local/opt/qt@5/lib"
export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/qt@5/include"
export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
export PATH="${HOMEBREW_PATH}/opt/qt@5/bin:$PATH"
export LDFLAGS="$LDFLAGS -L${HOMEBREW_PATH}/opt/qt@5/lib"
export CPPFLAGS="$CPPFLAGS -I${HOMEBREW_PATH}/opt/qt@5/include"
export PKG_CONFIG_PATH="${HOMEBREW_PATH}/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
export MACOSX_DEPLOYMENT_TARGET="10.14"
INSTALL_PREFIX=${PWD}/webcamoid-data

Expand Down

0 comments on commit 096846c

Please sign in to comment.