From 5b46db5e6b9ec4cbab863c194b37706af73b8d6e Mon Sep 17 00:00:00 2001
From: nastys <7950891+nastys@users.noreply.github.com>
Date: Tue, 26 Sep 2023 17:08:36 +0200
Subject: [PATCH] macOS CI: reinstall jpeg-xl and other dependencies from
 source (#14673)

* macOS CI: uninstall jpeg-xl before building it from source
* macOS CI: disable 7z artifact
---
 .ci/build-mac.sh  | 4 ++--
 .ci/deploy-mac.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh
index 981fa68618..bfdb1cdb14 100755
--- a/.ci/build-mac.sh
+++ b/.ci/build-mac.sh
@@ -6,8 +6,8 @@ brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv
 #/usr/sbin/softwareupdate --install-rosetta --agree-to-license
 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 arch -x86_64 /usr/local/bin/brew update
-arch -x86_64 /usr/local/bin/brew install --build-from-source ffmpeg gnutls freetype jpeg-xl
-arch -x86_64 /usr/local/bin/brew install -f --overwrite llvm@16 glew cmake sdl2 vulkan-headers coreutils
+arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source ffmpeg gnutls freetype jpeg-xl
+arch -x86_64 /usr/local/bin/brew install llvm@16 glew cmake sdl2 vulkan-headers coreutils
 arch -x86_64 /usr/local/bin/brew link -f llvm@16
 
 # moltenvk based on commit for 1.2.5 release
diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh
index 389757285b..a63397862b 100755
--- a/.ci/deploy-mac.sh
+++ b/.ci/deploy-mac.sh
@@ -51,7 +51,7 @@ DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-$
 "$DMG_FILEPATH" \
 RPCS3.app
 
-"$BREW_X64_PATH/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app
+#"$BREW_X64_PATH/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app
 
 FILESIZE=$(stat -f %z "$DMG_FILEPATH")
 SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }')
@@ -59,4 +59,4 @@ cd ..
 echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
 cd bin
 
-mv ./rpcs3*_macos.7z "$ARTDIR"
+#mv ./rpcs3*_macos.7z "$ARTDIR"