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

CI: fix mac universal rebuild for nightlies #6084

Merged
merged 1 commit into from
Jul 26, 2024
+13 −5
Merged

CI: fix mac universal rebuild for nightlies #6084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions scripts/travis/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@
# Examples: scripts/travis/build.sh

MAKE_DEBUG_OPTION=""
MAKE_UNIVERSAL_OPTION=""

while [ "$1" != "" ]; do
case "$1" in
--make_debug)
shift
MAKE_DEBUG_OPTION="1"
;;
--make_universal)
shift
MAKE_UNIVERSAL_OPTION="1"
;;
*)
echo "Unknown option" "$1"
exit 1
Expand Down Expand Up @@ -75,13 +81,15 @@ set -e
scripts/travis/before_build.sh
duration "before_build.sh"

if [ "${OS}-${ARCH}" = "linux-arm" ] || [ "${OS}-${ARCH}" = "windows-amd64" ]; then
# for arm, build just the basic distro
if [ "${OS}-${ARCH}" = "windows-amd64" ]; then
# for windows, we still have some issues with the enlistment checking, so we'll make it simple for now.
MAKE_DEBUG_OPTION=""
fi

if [ "${MAKE_DEBUG_OPTION}" != "" ]; then
if [ "${MAKE_UNIVERSAL_OPTION}" != "" ]; then
make universal
duration "make universal"
elif [ "${MAKE_DEBUG_OPTION}" != "" ]; then
make build build-race
duration "make build build-race"
else
Expand Down
4 changes: 2 additions & 2 deletions scripts/travis/deploy_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ fi

if [ "${NIGHTLY_BUILD}" == "true" ]; then
# we want to rebuild universal binaries for nightly builds
NO_BUILD=true
if [ "${OSARCH}" == "darwin/arm64" ]; then
make universal
./scripts/travis/build.sh --make_universal
OSARCH="darwin/universal"
fi
NO_BUILD=true
fi

if [ -z "${NO_BUILD}" ] || [ "${NO_BUILD}" != "true" ]; then
Expand Down
Loading