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

[EXPERIMENTAL] Something's Wrong I Can Feel It (x86_64 apple funny business) #134275

Closed
wants to merge 1 commit into from
Closed

[EXPERIMENTAL] Something's Wrong I Can Feel It (x86_64 apple funny business) #134275

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
10 changes: 6 additions & 4 deletions src/ci/github-actions/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,16 +335,18 @@ auto:
# macOS Builders #
####################

- image: dist-x86_64-apple
# XXX(jieyouxu): temporarily change name so we get LLVM assertions...
- image: dist-x86_64-apple-alt
env:
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
MACOSX_DEPLOYMENT_TARGET: 10.12
SELECT_XCODE: /Applications/Xcode_15.2.app
NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1
# XXX(jieyouxu): I want assertions
#NO_LLVM_ASSERTIONS: 1
#NO_DEBUG_ASSERTIONS: 1
#NO_OVERFLOW_CHECKS: 1
Copy link
Member

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 is enough, because you still have DEPLOY and not DEPLOY_ALT here:

rust/src/ci/run.sh

Lines 127 to 130 in 4847d6a

elif [ "$DEPLOY_ALT" != "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
fi

... and that's set automatically by the image name here:

rust/src/ci/scripts/setup-environment.sh

Lines 30 to 36 in 4847d6a

if [[ "${CI_JOB_NAME}" = *-alt ]]; then
echo "alternate dist builder detected, setting DEPLOY_ALT=1"
ciCommandSetEnv DEPLOY_ALT 1
else
echo "normal dist builder detected, setting DEPLOY=1"
ciCommandSetEnv DEPLOY 1
fi

Copy link
Member Author

Choose a reason for hiding this comment

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

I did a lil hack by changing the job name to dist-x86_64-apple-alt

Copy link
Member Author

@jieyouxu jieyouxu Dec 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Also thank you for pointing this out, I would not have guessed otherwise

DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-macos-xl
Expand Down
Loading