Skip to content

Commit

Permalink
update macos github workflow (#1265)
Browse files Browse the repository at this point in the history
* update github macos runners.

macos-11 runner is now deprecated.

* update xcode versions for github

* update XML_CATALOG_FILES for macos-14 runner

* work around macos-14 runner brew locations

* find homebrew gsed on apple silicon

* generalize brew location detection in macos workflow

* update python version for arm availability

* push xcode versions to latest minor levels.
  • Loading branch information
tsteven4 authored Apr 11, 2024
1 parent 10b8fd4 commit 7617c21
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ jobs:
matrix:
include:
- QT_VERSION: '5.15.2'
XCODE_VERSION: '12.5.1'
XCODE_VERSION: '13.4.1'
GENERATOR: 'Ninja'
RELEASE: false
os: macos-11
os: macos-12
- QT_VERSION: '6.2.4'
XCODE_VERSION: '13.4.1'
XCODE_VERSION: '14.3.1'
GENERATOR: 'Xcode'
RELEASE: false
os: macos-12
os: macos-13
- QT_VERSION: '6.2.4'
XCODE_VERSION: '13.4.1'
XCODE_VERSION: '14.3.1'
GENERATOR: 'Ninja'
RELEASE: true
os: macos-12
os: macos-13
- QT_VERSION: '6.5.3'
XCODE_VERSION: '14.2'
XCODE_VERSION: '15.3'
GENERATOR: 'Ninja'
RELEASE: false
os: macos-12
os: macos-14

steps:
- name: Checkout repository
Expand All @@ -54,7 +54,7 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.12'

- name: Qt install
if: steps.cache.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Script
env:
XML_CATALOG_FILES: /usr/local/etc/xml/catalog
XML_CATALOG_FILES: ${{ runner.arch == 'ARM64' && '/opt/homebrew/etc/xml/catalog' || '/usr/local/etc/xml/catalog' }}
run: |
source ${HOME}/Cache/qt-${{ matrix.QT_VERSION }}.env
sudo xcode-select --switch /Applications/Xcode_${{ matrix.XCODE_VERSION }}.app
Expand Down
7 changes: 4 additions & 3 deletions tools/fixdoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ DIR=$1
TITLE=$2

SED="sed"
# MacOS using Homebrew
[ -f /usr/local/bin/gsed ] && SED=/usr/local/bin/gsed
[ -f /opt/local/bin/gsed ] && SED=/opt/local/bin/gsed
# macOS using Homebrew may be /usr/local (macOS intel) or /opt/homebrew (apple silicion) ...
if command -v gsed >/dev/null 2>&1; then
SED=$(command -v gsed)
fi

[ ! -d "$DIR/tpl" ] && mkdir -p "$DIR/tpl"

Expand Down

0 comments on commit 7617c21

Please sign in to comment.