diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml index 8e974c4f7..558f7faff 100644 --- a/.gitlab/ci/jobs/macos-arm64.yml +++ b/.gitlab/ci/jobs/macos-arm64.yml @@ -22,10 +22,11 @@ osxcross arm64: # apt_development echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages" - osxcross-macports install --arm64 libopenmpt || osxcross-macports install --verbose --arm64 libopenmpt || true - - osxcross-macports install --arm64 wavpack || osxcross-macports install --verbose --arm64 wavpack || true + - osxcross-macports install --arm64 wavpack || osxcross-macports install --verbose --arm64 wavpack || true - osxcross-macports install --arm64 libxmp opusfile || osxcross-macports install --verbose --arm64 libxmp opusfile - osxcross-macports install --static --arm64 libsdl2_mixer || osxcross-macports install --verbose --static --arm64 libsdl2_mixer || true - - osxcross-macports install --static --arm64 miniupnpc curl libpng || osxcross-macports install --verbose --static --arm64 miniupnpc curl libpng + - osxcross-macports install --static --arm64 curl || osxcross-macports install --verbose --static --arm64 curl || true + - osxcross-macports install --static --arm64 miniupnpc libpng || osxcross-macports install --verbose --static --arm64 miniupnpc libpng - | # apt_development echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K" diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml index e90d28b51..73b4034b0 100644 --- a/.gitlab/ci/jobs/macos-x86_64.yml +++ b/.gitlab/ci/jobs/macos-x86_64.yml @@ -22,10 +22,11 @@ osxcross x86_64: # apt_development echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages" - osxcross-macports install libopenmpt || osxcross-macports install --verbose libopenmpt || true - - osxcross-macports install wavpack || osxcross-macports install --verbose wavpack || true + - osxcross-macports install wavpack || osxcross-macports install --verbose wavpack || true - osxcross-macports install libxmp opusfile || osxcross-macports install --verbose libxmp opusfile - osxcross-macports install --static libsdl2_mixer || osxcross-macports install --verbose --static libsdl2_mixer || true - - osxcross-macports install --static miniupnpc curl libpng || osxcross-macports install --verbose --static miniupnpc curl libpng + - osxcross-macports install --static curl || osxcross-macports install --verbose --static curl || true + - osxcross-macports install --static miniupnpc libpng || osxcross-macports install --verbose --static miniupnpc libpng - | # apt_development echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K"