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.

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

macOS CI: move to AArch64 VM (x64 builds) #13155

Merged
merged 9 commits into from
Jan 21, 2023
Merged

Conversation

nastys
Copy link
Contributor

@nastys nastys commented Dec 31, 2022

No description provided.

@nastys nastys force-pushed the master branch 20 times, most recently from 522a3ad to 8edfe3b Compare January 2, 2023 21:40
@Megamouse Megamouse added OS: macOS Build and CI Anything related to the build process and continuous integration labels Jan 4, 2023
@nastys nastys force-pushed the master branch 8 times, most recently from 1edfe6a to fac3786 Compare January 6, 2023 10:21
@nastys nastys force-pushed the master branch 4 times, most recently from 2cd0a00 to 9c1d805 Compare January 10, 2023 13:10
@@ -33,7 +35,7 @@ echo "IconIndex=0" >> Quickstart.url

DMG_FILEPATH="$BUILD_ARTIFACTSTAGINGDIRECTORY/rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_macos.dmg"

create-dmg --volname RPCS3 \
"/usr/local/Homebrew/bin/create-dmg" --volname RPCS3 \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this path is valid. Should probably be

Suggested change
"/usr/local/Homebrew/bin/create-dmg" --volname RPCS3 \
"/usr/local/bin/create-dmg" --volname RPCS3 \

or

Suggested change
"/usr/local/Homebrew/bin/create-dmg" --volname RPCS3 \
"/usr/local/opt/create-dmg/bin/create-dmg" --volname RPCS3 \

@@ -45,7 +47,7 @@ create-dmg --volname RPCS3 \
"$DMG_FILEPATH" \
RPCS3.app

7z a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app
"/usr/local/Homebrew/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

Suggested change
"/usr/local/Homebrew/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app
"/usr/local/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app

or

Suggested change
"/usr/local/Homebrew/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app
"/usr/local/opt/p7zip/bin/7z" a -mx9 rpcs3-v"${COMM_TAG}"-"${COMM_COUNT}"-"${COMM_HASH}"_macos.7z RPCS3.app

Update macOS build script
@nastys nastys force-pushed the master branch 2 times, most recently from 60a9963 to d26905c Compare January 16, 2023 20:56
@nastys nastys force-pushed the master branch 2 times, most recently from e99e3ca to 0977896 Compare January 21, 2023 17:02
@nastys nastys changed the title (testing) macOS CI: move to AArch64 VM macOS CI: move to AArch64 VM (x64 builds) Jan 21, 2023
@nastys nastys marked this pull request as ready for review January 21, 2023 17:42
@Megamouse Megamouse merged commit 53cc067 into RPCS3:master Jan 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build and CI Anything related to the build process and continuous integration OS: macOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants