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

Fix build server only deploys arm64 macOS binaries #1835

Merged
merged 2 commits into from May 2, 2024
Merged

Fix build server only deploys arm64 macOS binaries #1835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88d4627
Fix build server only deploys arm64 macOS binaries
MrStevns Apr 26, 2024
5bc846b
Update .github/actions/create-package/create-package.sh
MrStevns Apr 27, 2024
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
5 changes: 3 additions & 2 deletions .github/actions/create-package/create-package.sh
View file
Open in desktop
Expand Up @@ -98,8 +98,9 @@ create_package_macos() {
popd >/dev/null
echo "Create ZIP"
local qtsuffix="-qt${INPUT_QT}"
bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-$3.zip" Pencil2D
echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-$3" > "${GITHUB_OUTPUT}"
local arch=`uname -m`
bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-${arch}.zip" Pencil2D
echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-${arch}" > "${GITHUB_OUTPUT}"
MrStevns marked this conversation as resolved.
Show resolved Hide resolved
}

create_package_windows() {
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -32,6 +32,10 @@ jobs:
container: { image: "ubuntu:16.04", options: --privileged }
qt: 5
- name: Qt 5 / macOS x86_64
os: macos-12
container:
qt: 5
- name: Qt 5 / macOS arm64
chchwy marked this conversation as resolved.
Show resolved Hide resolved
os: macos-latest
container:
qt: 5
Expand All @@ -53,6 +57,10 @@ jobs:
container: { image: "ubuntu:22.04", options: --privileged }
qt: 6
- name: Qt 6 / macOS x86_64
os: macos-12
container:
qt: 6
- name: Qt 6 / macOS arm64
os: macos-latest
container:
qt: 6
Expand Down