mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2024-11-10 06:51:54 +00:00
Fix universal MacOS CI build (#1106)
Do not build libomp, because it depends on cmake-bootstrap, which for some reason tries to execute a unit test compiled for arm64, which obviously fails on a x86_64 host.
This commit is contained in:
parent
d554067fc5
commit
0d0b4d4b84
1 changed files with 12 additions and 11 deletions
|
@ -115,29 +115,26 @@ jobs:
|
|||
path: '/opt/local'
|
||||
cacheHitVar: CACHE_RESTORED
|
||||
- script: |
|
||||
set -x
|
||||
set -ex
|
||||
export PATH=$PATH:/opt/local/bin
|
||||
echo $PATH
|
||||
which codesign
|
||||
codesign --help
|
||||
which port
|
||||
cmake --version || true
|
||||
|
||||
echo "+universal" | sudo tee -a /opt/local/etc/macports/variants.conf
|
||||
|
||||
|
||||
sudo sh -c 'cat << EOF >> /opt/local/etc/macports/macports.conf
|
||||
buildfromsource always
|
||||
universal_archs arm64 x86_64
|
||||
ui_interactive no
|
||||
EOF'
|
||||
|
||||
sudo port deps glib2-devel
|
||||
sudo port deps libsndfile
|
||||
sudo port deps dbus-glib
|
||||
sudo port deps libomp-devel
|
||||
sudo port install glib2-devel libsndfile dbus-glib libomp-devel
|
||||
# remove all extended attributes, as they cannot be restored when restoring the pipeline cache
|
||||
sudo xattr -rcv /opt/local
|
||||
|
||||
sudo port install glib2-devel libsndfile dbus-glib readline
|
||||
# fixup permissions to allow non-priv pipeline user access every directory, to make the caching step succeed at the end
|
||||
sudo chown -R $(id -u):$(id -g) /opt/local
|
||||
# remove all extended attributes, as they cannot be restored when restoring the pipeline cache
|
||||
#sudo xattr -rcv /opt/local
|
||||
displayName: 'Port install universal'
|
||||
condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
|
||||
- script: |
|
||||
|
@ -153,7 +150,11 @@ jobs:
|
|||
sudo port -v install fluidsynth +universal
|
||||
displayName: 'port install fluidsynth +universal'
|
||||
condition: failed()
|
||||
enabled: false
|
||||
- script: |
|
||||
set -x
|
||||
cat /opt/local/var/macports/logs/*cmake-bootstrap/cmake-bootstrap/main.log
|
||||
cat /opt/local/var/macports/build/*cmake-bootstrap/cmake-bootstrap/work/cmake-3.9.4-arm64/Bootstrap.cmk/*.log
|
||||
cat /opt/local/var/macports/logs/*_fluidsynth/fluidsynth/main.log
|
||||
condition: failed()
|
||||
displayName: 'Print fluidsynth error log'
|
||||
|
|
Loading…
Reference in a new issue