Skip to content

Commit

Permalink
fix(ci): hotfix for OOM regression
Browse files Browse the repository at this point in the history
Previous fix added stable- target, didn't work.
For some reason the config.toml rustflags are no longer picked up in the
CI, even though they still are locally.

Adding the flags manually in the CI workflow works, but is gross.
However, main is broken so for now this is it while we try to find the
root cause.
  • Loading branch information
Gilad Chase committed Dec 10, 2024
1 parent 324bdea commit 01f6c8a
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ TABLEGEN_190_PREFIX = "/usr/lib/llvm-19/"
# https://nnethercote.github.io/perf-book/build-configuration.html#linking.
# TODO: remove this once `rust` stabilizes `lld` as the default linker, currently only on nightly:
# https://github.com/rust-lang/rust/issues/39915#issuecomment-618726211
[target.x86_64-unknown-linux-gnu]
[target.stable-x86_64-unknown-linux-gnu]
[target.'cfg(all(target_os = "linux"))']
rustflags = ["-Clink-arg=-fuse-ld=lld"]
2 changes: 1 addition & 1 deletion .github/workflows/blockifier_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
- 'scripts/sequencer-ci.Dockerfile'

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/blockifier_compiled_cairo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
- 'scripts/dependencies.sh'

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/blockifier_reexecution_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- 'scripts/sequencer-ci.Dockerfile'

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/committer_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- 'scripts/dependencies.sh'

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/committer_cli_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
- 'scripts/dependencies.sh'

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

env:
CI: 1
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- edited

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/papyrus_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
types: [checks_requested]

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/papyrus_docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
env:
REGISTRY: ghcr.io
REPO_NAME: ${{ github.repository }}
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

jobs:
docker-build-push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/papyrus_nightly-tests-call.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
required: true

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

jobs:
GW-integration-test-call:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/papyrus_nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch: # Uses ubuntu runner.

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

jobs:
GW-integration-test-ubuntu:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sequencer_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

env:
SEQUENCER_INTEGRATION_TESTS: 1
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload_artifacts_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [completed]

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

jobs:
native-blockifier-artifacts-push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- cron: '0 0 * * *' # Runs at 00:00 UTC every day

env:
RUSTFLAGS: "-D warnings"
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

jobs:
latest_deps:
Expand Down

0 comments on commit 01f6c8a

Please sign in to comment.