From f32bdb77a28f01856c9a1ab0e56562de2d36b8e6 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 3 Mar 2025 05:59:40 -0500
Subject: [PATCH] GitLab CI: allow failure of sdl2_mixer download from macports
---
.gitlab/ci/jobs/macos-arm64.yml | 3 ++-
.gitlab/ci/jobs/macos-x86_64.yml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 351b3a02bd..557f3a52ae 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -22,7 +22,8 @@ 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 libxmp wavpack opusfile || osxcross-macports install --arm64 libopenmpt libxmp wavpack opusfile
- - osxcross-macports install --static --arm64 miniupnpc curl libsdl2_mixer libpng || osxcross-macports install --static --arm64 miniupnpc curl libsdl2_mixer libpng
+ - osxcross-macports install --static --arm64 libsdl2_mixer || osxcross-macports install --static --arm64 libsdl2_mixer || true
+ - osxcross-macports install --static --arm64 miniupnpc curl libpng || osxcross-macports install --static --arm64 miniupnpc curl 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 fd0618eb16..2e78f22033 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -22,7 +22,8 @@ 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 libxmp wavpack opusfile || osxcross-macports install libopenmpt libxmp wavpack opusfile
- - osxcross-macports install --static miniupnpc curl libsdl2_mixer libpng || osxcross-macports install --static miniupnpc curl libsdl2_mixer libpng
+ - osxcross-macports install --static libsdl2_mixer || osxcross-macports install --static libsdl2_mixer || true
+ - osxcross-macports install --static miniupnpc curl libpng || osxcross-macports install --static miniupnpc curl libpng
- |
# apt_development
echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K"
--
GitLab