Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dbd1955

Browse files
authoredJan 9, 2024
Unrolled build for rust-lang#119734
Rollup merge of rust-lang#119734 - RalfJung:miri, r=RalfJung Miri subtree update r? ``@ghost``
2 parents a399117 + 0ddccf9 commit dbd1955

File tree

21 files changed

+864
-554
lines changed

21 files changed

+864
-554
lines changed
 

‎Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -2465,6 +2465,7 @@ dependencies = [
24652465
"ctrlc",
24662466
"env_logger",
24672467
"getrandom",
2468+
"jemalloc-sys",
24682469
"lazy_static",
24692470
"libc",
24702471
"libffi",
@@ -2474,7 +2475,6 @@ dependencies = [
24742475
"rand",
24752476
"regex",
24762477
"rustc_version",
2477-
"serde",
24782478
"smallvec",
24792479
"ui_test",
24802480
]
@@ -3280,9 +3280,9 @@ dependencies = [
32803280

32813281
[[package]]
32823282
name = "rustc-build-sysroot"
3283-
version = "0.4.2"
3283+
version = "0.4.4"
32843284
source = "registry+https://github.com/rust-lang/crates.io-index"
3285-
checksum = "8ed2a90dfa5232ed5ff21d53d4df655f315ab316ea06fc508f1c74bcedb1ce6c"
3285+
checksum = "39dcf8d82b1f79a179bdb284dc44db440a9666eefa5a6df5ef282d6db930d544"
32863286
dependencies = [
32873287
"anyhow",
32883288
"rustc_version",

‎src/tools/miri/.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
cargo -V
7474
7575
- name: Test
76-
run: ./ci.sh
76+
run: ./ci/ci.sh
7777

7878
style:
7979
name: style checks
@@ -169,7 +169,7 @@ jobs:
169169
--message 'Dear @*T-miri*,
170170
171171
It would appear that the [Miri cron job build]('"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"') failed.
172-
172+
173173
This likely means that rustc changed the miri directory and
174174
we now need to do a [`./miri rustc-pull`](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#importing-changes-from-the-rustc-repo).
175175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Tier 2 sysroots
2+
3+
on: push
4+
# schedule:
5+
# - cron: '44 4 * * *' # At 4:44 UTC every day.
6+
7+
defaults:
8+
run:
9+
shell: bash
10+
11+
jobs:
12+
sysroots:
13+
name: Build the sysroots
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Build the sysroots
18+
run: |
19+
cargo install -f rustup-toolchain-install-master
20+
./miri toolchain -c rust-docs # Docs are the only place targets are separated by tier
21+
./miri install
22+
python3 -m pip install beautifulsoup4
23+
./ci/build-all-targets.sh
24+
25+
sysroots-cron-fail-notify:
26+
name: sysroots cronjob failure notification
27+
runs-on: ubuntu-latest
28+
needs: [sysroots]
29+
if: failure() || cancelled()
30+
steps:
31+
# Send a Zulip notification
32+
- name: Install zulip-send
33+
run: pip3 install zulip
34+
- name: Send Zulip notification
35+
env:
36+
ZULIP_BOT_EMAIL: ${{ secrets.ZULIP_BOT_EMAIL }}
37+
ZULIP_API_TOKEN: ${{ secrets.ZULIP_API_TOKEN }}
38+
run: |
39+
~/.local/bin/zulip-send --user $ZULIP_BOT_EMAIL --api-key $ZULIP_API_TOKEN --site https://rust-lang.zulipchat.com \
40+
--stream miri --subject "Cron Job Failure (miri, $(date -u +%Y-%m))" \
41+
--message 'Dear @*T-miri*,
42+
43+
It would appear that the [Miri sysroots cron job build]('"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"') failed.
44+
45+
Would you mind investigating this issue?
46+
47+
Thanks in advance!
48+
Sincerely,
49+
The Miri Cronjobs Bot'

0 commit comments

Comments
 (0)
Please sign in to comment.