diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 452378aaaa..131063dec3 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -1,11 +1,11 @@ #!/bin/sh -ex export HOMEBREW_NO_AUTO_UPDATE=1 -brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv +brew install -f --overwrite nasm ninja git p7zip ccache pipenv #create-dmg #/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 install -f --overwrite python@3.11 || arch -x86_64 /usr/local/bin/brew link --overwrite python@3.11 +arch -x86_64 /usr/local/bin/brew install -f --overwrite python@3.12 || arch -x86_64 /usr/local/bin/brew link --overwrite python@3.12 arch -x86_64 /usr/local/bin/brew update arch -x86_64 /usr/local/bin/brew uninstall -f --ignore-dependencies ffmpeg arch -x86_64 /usr/local/bin/brew install -f --build-from-source ffmpeg diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh index a63397862b..20de7023ea 100755 --- a/.ci/deploy-mac.sh +++ b/.ci/deploy-mac.sh @@ -36,27 +36,27 @@ echo "[InternetShortcut]" > Quickstart.url echo "URL=https://rpcs3.net/quickstart" >> Quickstart.url echo "IconIndex=0" >> Quickstart.url -DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.dmg" +#DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.dmg" +#"$BREW_X64_PATH/bin/create-dmg" --volname RPCS3 \ +#--window-size 800 400 \ +#--icon-size 100 \ +#--icon rpcs3.app 200 190 \ +#--add-file Quickstart.url Quickstart.url 400 20 \ +#--hide-extension rpcs3.app \ +#--hide-extension Quickstart.url \ +#--app-drop-link 600 185 \ +#--skip-jenkins \ +#--format ULMO \ +#"$DMG_FILEPATH" \ +#RPCS3.app +#FILESIZE=$(stat -f %z "$DMG_FILEPATH") +#SHA256SUM=$(shasum -a 256 "$DMG_FILEPATH" | awk '{ print $1 }') -"$BREW_X64_PATH/bin/create-dmg" --volname RPCS3 \ ---window-size 800 400 \ ---icon-size 100 \ ---icon rpcs3.app 200 190 \ ---add-file Quickstart.url Quickstart.url 400 20 \ ---hide-extension rpcs3.app \ ---hide-extension Quickstart.url \ ---app-drop-link 600 185 \ ---skip-jenkins \ ---format ULMO \ -"$DMG_FILEPATH" \ -RPCS3.app +ARCHIVE_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.7z" +"$BREW_X64_PATH/bin/7z" a -mx9 "$ARCHIVE_FILEPATH" RPCS3.app Quickstart.url +FILESIZE=$(stat -f %z "$ARCHIVE_FILEPATH") +SHA256SUM=$(shasum -a 256 "$ARCHIVE_FILEPATH" | awk '{ print $1 }') -#"$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 }') cd .. echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE" cd bin - -#mv ./rpcs3*_macos.7z "$ARTDIR"