Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

macOS CI: use 7-Zip for artifacts #14881

Merged
merged 8 commits into from
Dec 11, 2023
Merged

macOS CI: use 7-Zip for artifacts #14881

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bbb2b23
macOS CI: use 7z for artifacts
nastys Dec 9, 2023
2c0e9dc
Update build-mac.sh
nastys Dec 9, 2023
6815177
Update deploy-mac.sh
nastys Dec 10, 2023
6bc542f
Merge branch 'master' into nastys-patch-12
nastys Dec 10, 2023
c198dcb
Update .ci/deploy-mac.sh
nastys Dec 10, 2023
edc6286
Update build-mac.sh
nastys Dec 10, 2023
5cf66c0
Merge branch 'master' into nastys-patch-12
elad335 Dec 11, 2023
4b2f4be
Merge branch 'master' into nastys-patch-12
Megamouse Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/build-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/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)"
Expand Down
42 changes: 21 additions & 21 deletions .ci/deploy-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

"$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

#"$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 }')
#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 }')

7Z_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z"
nastys marked this conversation as resolved.
Show resolved Hide resolved
"$BREW_X64_PATH/bin/7z" a -mx9 "$7Z_FILEPATH" RPCS3.app Quickstart.url
FILESIZE=$(stat -f %z "$7Z_FILEPATH")
SHA256SUM=$(shasum -a 256 "$7Z_FILEPATH" | awk '{ print $1 }')

cd ..
echo "${SHA256SUM};${FILESIZE}B" > "$RELEASE_MESSAGE"
cd bin

#mv ./rpcs3*_macos.7z "$ARTDIR"