forked from AcademySoftwareFoundation/OpenRV
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Cédrik Fuoco <[email protected]>
- Loading branch information
1 parent
db17195
commit ed6ca9b
Showing
2 changed files
with
14 additions
and
6 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,7 +36,7 @@ runs: | |
echo "cached=${{ steps.arm64-qt.outputs.cache-hit }}" >> $GITHUB_OUTPUT | ||
shell: bash | ||
|
||
- name: Switch to XCode 14 | ||
- name: Switch to XCode 15 | ||
if: steps.arm64-qt.outputs.cache-hit != 'true' | ||
run: | | ||
sudo xcode-select -switch /Applications/Xcode_${{ inputs.xcode-version }}.app | ||
|
@@ -48,7 +48,7 @@ runs: | |
brew install --quiet --formula libiconv libpng libpq libtool libuv libxau libxcb libxdmcp | ||
brew install --quiet --formula autoconf automake cmake pcre2 harfbuzz freetype node@18 nspr nss | ||
brew install --quiet --formula xcb-proto xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm | ||
brew install --quiet --formula brotli bzip2 dbus glew icu4c jpeg md4c [email protected] pkg-config sqlite xorgproto zlib zstd | ||
brew install --quiet --formula brotli bzip2 dbus glew icu4c@76 jpeg md4c [email protected] pkg-config sqlite xorgproto zlib zstd | ||
brew list [email protected] | ||
shell: bash | ||
|
||
|
@@ -100,6 +100,14 @@ runs: | |
mv qt-everywhere-src-${{ inputs.qt-version }} qt-src | ||
shell: bash | ||
|
||
- name: Patch Qt ${{ matrix.qt-version }} | ||
# There is an issue with Clang15 and Qt < 5.15.15. | ||
run: | | ||
curl -o file.zip https://codereview.qt-project.org/changes/qt%2Fqtbase~503172/revisions/3/files/mkspecs%2Ffeatures%2Ftoolchain.prf/download | ||
unzip file.zip | ||
cp $(unzip -l file.zip | awk 'NR==4 {print $4}') qt-src/mkspecs/features/toolchain.prf | ||
shell: bash | ||
|
||
- name: Create directory for build | ||
if: steps.arm64-qt.outputs.cache-hit != 'true' | ||
run: | | ||
|
@@ -141,7 +149,7 @@ runs: | |
-skip qtpurchasing \ | ||
-skip qtlocation \ | ||
-I /opt/homebrew/Cellar/[email protected]/1.1.1w/include -L /opt/homebrew/Cellar/[email protected]/1.1.1w/lib \ | ||
-I /opt/homebrew/Cellar/icu4c/74.2/include -L /opt/homebrew/Cellar/icu4c/74.2/lib | ||
-I $(realpath $(brew --prefix icu4c@76))/include -L $(realpath $(brew --prefix icu4c@76))/lib | ||
working-directory: ${{ github.workspace }}/qt-build | ||
shell: bash | ||
|
||
|
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