Skip to content

Commit 638666f

Browse files
rust-timerrust-timer
committed
Revert to d3df851 
1 parent 8ad7bc3 commit 638666f

File tree

239 files changed

+2190
-7378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+2190
-7378
lines changed

‎.github/workflows/ci.yml

+81-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ name: CI
2626
- "**"
2727
defaults:
2828
run:
29-
shell: bash
29+
shell: "python src/ci/exec-with-shell.py {0}"
3030
jobs:
3131
pr:
3232
name: PR
@@ -54,6 +54,7 @@ jobs:
5454
steps:
5555
- name: disable git crlf conversion
5656
run: git config --global core.autocrlf false
57+
shell: bash
5758
- name: checkout the source code
5859
uses: actions/checkout@v1
5960
with:
@@ -65,66 +66,85 @@ jobs:
6566
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6667
- name: add extra environment variables
6768
run: src/ci/scripts/setup-environment.sh
69+
shell: bash
6870
env:
6971
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
7072
if: success() && !env.SKIP_JOB
7173
- name: decide whether to skip this job
7274
run: src/ci/scripts/should-skip-this.sh
75+
shell: bash
7376
if: success() && !env.SKIP_JOB
7477
- name: collect CPU statistics
7578
run: src/ci/scripts/collect-cpu-stats.sh
79+
shell: bash
7680
if: success() && !env.SKIP_JOB
7781
- name: show the current environment
7882
run: src/ci/scripts/dump-environment.sh
83+
shell: bash
7984
if: success() && !env.SKIP_JOB
8085
- name: install awscli
8186
run: src/ci/scripts/install-awscli.sh
87+
shell: bash
8288
if: success() && !env.SKIP_JOB
8389
- name: install sccache
8490
run: src/ci/scripts/install-sccache.sh
91+
shell: bash
8592
if: success() && !env.SKIP_JOB
8693
- name: install clang
8794
run: src/ci/scripts/install-clang.sh
95+
shell: bash
8896
if: success() && !env.SKIP_JOB
8997
- name: install WIX
9098
run: src/ci/scripts/install-wix.sh
99+
shell: bash
91100
if: success() && !env.SKIP_JOB
92101
- name: ensure the build happens on a partition with enough space
93102
run: src/ci/scripts/symlink-build-dir.sh
103+
shell: bash
94104
if: success() && !env.SKIP_JOB
95105
- name: disable git crlf conversion
96106
run: src/ci/scripts/disable-git-crlf-conversion.sh
107+
shell: bash
97108
if: success() && !env.SKIP_JOB
98109
- name: install MSYS2
99110
run: src/ci/scripts/install-msys2.sh
111+
shell: bash
100112
if: success() && !env.SKIP_JOB
101113
- name: install MinGW
102114
run: src/ci/scripts/install-mingw.sh
115+
shell: bash
103116
if: success() && !env.SKIP_JOB
104117
- name: install ninja
105118
run: src/ci/scripts/install-ninja.sh
119+
shell: bash
106120
if: success() && !env.SKIP_JOB
107121
- name: enable ipv6 on Docker
108122
run: src/ci/scripts/enable-docker-ipv6.sh
123+
shell: bash
109124
if: success() && !env.SKIP_JOB
110125
- name: disable git crlf conversion
111126
run: src/ci/scripts/disable-git-crlf-conversion.sh
127+
shell: bash
112128
if: success() && !env.SKIP_JOB
113129
- name: checkout submodules
114130
run: src/ci/scripts/checkout-submodules.sh
131+
shell: bash
115132
if: success() && !env.SKIP_JOB
116133
- name: ensure line endings are correct
117134
run: src/ci/scripts/verify-line-endings.sh
135+
shell: bash
118136
if: success() && !env.SKIP_JOB
119137
- name: run the build
120138
run: src/ci/scripts/run-build-from-ci.sh
139+
shell: bash
121140
env:
122141
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
123142
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
124143
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
125144
if: success() && !env.SKIP_JOB
126145
- name: upload artifacts to S3
127146
run: src/ci/scripts/upload-artifacts.sh
147+
shell: bash
128148
env:
129149
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
130150
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -153,6 +173,7 @@ jobs:
153173
steps:
154174
- name: disable git crlf conversion
155175
run: git config --global core.autocrlf false
176+
shell: bash
156177
- name: checkout the source code
157178
uses: actions/checkout@v1
158179
with:
@@ -164,66 +185,85 @@ jobs:
164185
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
165186
- name: add extra environment variables
166187
run: src/ci/scripts/setup-environment.sh
188+
shell: bash
167189
env:
168190
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
169191
if: success() && !env.SKIP_JOB
170192
- name: decide whether to skip this job
171193
run: src/ci/scripts/should-skip-this.sh
194+
shell: bash
172195
if: success() && !env.SKIP_JOB
173196
- name: collect CPU statistics
174197
run: src/ci/scripts/collect-cpu-stats.sh
198+
shell: bash
175199
if: success() && !env.SKIP_JOB
176200
- name: show the current environment
177201
run: src/ci/scripts/dump-environment.sh
202+
shell: bash
178203
if: success() && !env.SKIP_JOB
179204
- name: install awscli
180205
run: src/ci/scripts/install-awscli.sh
206+
shell: bash
181207
if: success() && !env.SKIP_JOB
182208
- name: install sccache
183209
run: src/ci/scripts/install-sccache.sh
210+
shell: bash
184211
if: success() && !env.SKIP_JOB
185212
- name: install clang
186213
run: src/ci/scripts/install-clang.sh
214+
shell: bash
187215
if: success() && !env.SKIP_JOB
188216
- name: install WIX
189217
run: src/ci/scripts/install-wix.sh
218+
shell: bash
190219
if: success() && !env.SKIP_JOB
191220
- name: ensure the build happens on a partition with enough space
192221
run: src/ci/scripts/symlink-build-dir.sh
222+
shell: bash
193223
if: success() && !env.SKIP_JOB
194224
- name: disable git crlf conversion
195225
run: src/ci/scripts/disable-git-crlf-conversion.sh
226+
shell: bash
196227
if: success() && !env.SKIP_JOB
197228
- name: install MSYS2
198229
run: src/ci/scripts/install-msys2.sh
230+
shell: bash
199231
if: success() && !env.SKIP_JOB
200232
- name: install MinGW
201233
run: src/ci/scripts/install-mingw.sh
234+
shell: bash
202235
if: success() && !env.SKIP_JOB
203236
- name: install ninja
204237
run: src/ci/scripts/install-ninja.sh
238+
shell: bash
205239
if: success() && !env.SKIP_JOB
206240
- name: enable ipv6 on Docker
207241
run: src/ci/scripts/enable-docker-ipv6.sh
242+
shell: bash
208243
if: success() && !env.SKIP_JOB
209244
- name: disable git crlf conversion
210245
run: src/ci/scripts/disable-git-crlf-conversion.sh
246+
shell: bash
211247
if: success() && !env.SKIP_JOB
212248
- name: checkout submodules
213249
run: src/ci/scripts/checkout-submodules.sh
250+
shell: bash
214251
if: success() && !env.SKIP_JOB
215252
- name: ensure line endings are correct
216253
run: src/ci/scripts/verify-line-endings.sh
254+
shell: bash
217255
if: success() && !env.SKIP_JOB
218256
- name: run the build
219257
run: src/ci/scripts/run-build-from-ci.sh
258+
shell: bash
220259
env:
221260
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
222261
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
223262
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
224263
if: success() && !env.SKIP_JOB
225264
- name: upload artifacts to S3
226265
run: src/ci/scripts/upload-artifacts.sh
266+
shell: bash
227267
env:
228268
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
229269
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -470,6 +510,7 @@ jobs:
470510
steps:
471511
- name: disable git crlf conversion
472512
run: git config --global core.autocrlf false
513+
shell: bash
473514
- name: checkout the source code
474515
uses: actions/checkout@v1
475516
with:
@@ -481,66 +522,85 @@ jobs:
481522
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
482523
- name: add extra environment variables
483524
run: src/ci/scripts/setup-environment.sh
525+
shell: bash
484526
env:
485527
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
486528
if: success() && !env.SKIP_JOB
487529
- name: decide whether to skip this job
488530
run: src/ci/scripts/should-skip-this.sh
531+
shell: bash
489532
if: success() && !env.SKIP_JOB
490533
- name: collect CPU statistics
491534
run: src/ci/scripts/collect-cpu-stats.sh
535+
shell: bash
492536
if: success() && !env.SKIP_JOB
493537
- name: show the current environment
494538
run: src/ci/scripts/dump-environment.sh
539+
shell: bash
495540
if: success() && !env.SKIP_JOB
496541
- name: install awscli
497542
run: src/ci/scripts/install-awscli.sh
543+
shell: bash
498544
if: success() && !env.SKIP_JOB
499545
- name: install sccache
500546
run: src/ci/scripts/install-sccache.sh
547+
shell: bash
501548
if: success() && !env.SKIP_JOB
502549
- name: install clang
503550
run: src/ci/scripts/install-clang.sh
551+
shell: bash
504552
if: success() && !env.SKIP_JOB
505553
- name: install WIX
506554
run: src/ci/scripts/install-wix.sh
555+
shell: bash
507556
if: success() && !env.SKIP_JOB
508557
- name: ensure the build happens on a partition with enough space
509558
run: src/ci/scripts/symlink-build-dir.sh
559+
shell: bash
510560
if: success() && !env.SKIP_JOB
511561
- name: disable git crlf conversion
512562
run: src/ci/scripts/disable-git-crlf-conversion.sh
563+
shell: bash
513564
if: success() && !env.SKIP_JOB
514565
- name: install MSYS2
515566
run: src/ci/scripts/install-msys2.sh
567+
shell: bash
516568
if: success() && !env.SKIP_JOB
517569
- name: install MinGW
518570
run: src/ci/scripts/install-mingw.sh
571+
shell: bash
519572
if: success() && !env.SKIP_JOB
520573
- name: install ninja
521574
run: src/ci/scripts/install-ninja.sh
575+
shell: bash
522576
if: success() && !env.SKIP_JOB
523577
- name: enable ipv6 on Docker
524578
run: src/ci/scripts/enable-docker-ipv6.sh
579+
shell: bash
525580
if: success() && !env.SKIP_JOB
526581
- name: disable git crlf conversion
527582
run: src/ci/scripts/disable-git-crlf-conversion.sh
583+
shell: bash
528584
if: success() && !env.SKIP_JOB
529585
- name: checkout submodules
530586
run: src/ci/scripts/checkout-submodules.sh
587+
shell: bash
531588
if: success() && !env.SKIP_JOB
532589
- name: ensure line endings are correct
533590
run: src/ci/scripts/verify-line-endings.sh
591+
shell: bash
534592
if: success() && !env.SKIP_JOB
535593
- name: run the build
536594
run: src/ci/scripts/run-build-from-ci.sh
595+
shell: bash
537596
env:
538597
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
539598
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
540599
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
541600
if: success() && !env.SKIP_JOB
542601
- name: upload artifacts to S3
543602
run: src/ci/scripts/upload-artifacts.sh
603+
shell: bash
544604
env:
545605
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
546606
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -595,6 +655,7 @@ jobs:
595655
steps:
596656
- name: disable git crlf conversion
597657
run: git config --global core.autocrlf false
658+
shell: bash
598659
- name: checkout the source code
599660
uses: actions/checkout@v1
600661
with:
@@ -606,66 +667,85 @@ jobs:
606667
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
607668
- name: add extra environment variables
608669
run: src/ci/scripts/setup-environment.sh
670+
shell: bash
609671
env:
610672
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
611673
if: success() && !env.SKIP_JOB
612674
- name: decide whether to skip this job
613675
run: src/ci/scripts/should-skip-this.sh
676+
shell: bash
614677
if: success() && !env.SKIP_JOB
615678
- name: collect CPU statistics
616679
run: src/ci/scripts/collect-cpu-stats.sh
680+
shell: bash
617681
if: success() && !env.SKIP_JOB
618682
- name: show the current environment
619683
run: src/ci/scripts/dump-environment.sh
684+
shell: bash
620685
if: success() && !env.SKIP_JOB
621686
- name: install awscli
622687
run: src/ci/scripts/install-awscli.sh
688+
shell: bash
623689
if: success() && !env.SKIP_JOB
624690
- name: install sccache
625691
run: src/ci/scripts/install-sccache.sh
692+
shell: bash
626693
if: success() && !env.SKIP_JOB
627694
- name: install clang
628695
run: src/ci/scripts/install-clang.sh
696+
shell: bash
629697
if: success() && !env.SKIP_JOB
630698
- name: install WIX
631699
run: src/ci/scripts/install-wix.sh
700+
shell: bash
632701
if: success() && !env.SKIP_JOB
633702
- name: ensure the build happens on a partition with enough space
634703
run: src/ci/scripts/symlink-build-dir.sh
704+
shell: bash
635705
if: success() && !env.SKIP_JOB
636706
- name: disable git crlf conversion
637707
run: src/ci/scripts/disable-git-crlf-conversion.sh
708+
shell: bash
638709
if: success() && !env.SKIP_JOB
639710
- name: install MSYS2
640711
run: src/ci/scripts/install-msys2.sh
712+
shell: bash
641713
if: success() && !env.SKIP_JOB
642714
- name: install MinGW
643715
run: src/ci/scripts/install-mingw.sh
716+
shell: bash
644717
if: success() && !env.SKIP_JOB
645718
- name: install ninja
646719
run: src/ci/scripts/install-ninja.sh
720+
shell: bash
647721
if: success() && !env.SKIP_JOB
648722
- name: enable ipv6 on Docker
649723
run: src/ci/scripts/enable-docker-ipv6.sh
724+
shell: bash
650725
if: success() && !env.SKIP_JOB
651726
- name: disable git crlf conversion
652727
run: src/ci/scripts/disable-git-crlf-conversion.sh
728+
shell: bash
653729
if: success() && !env.SKIP_JOB
654730
- name: checkout submodules
655731
run: src/ci/scripts/checkout-submodules.sh
732+
shell: bash
656733
if: success() && !env.SKIP_JOB
657734
- name: ensure line endings are correct
658735
run: src/ci/scripts/verify-line-endings.sh
736+
shell: bash
659737
if: success() && !env.SKIP_JOB
660738
- name: run the build
661739
run: src/ci/scripts/run-build-from-ci.sh
740+
shell: bash
662741
env:
663742
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
664743
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
665744
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
666745
if: success() && !env.SKIP_JOB
667746
- name: upload artifacts to S3
668747
run: src/ci/scripts/upload-artifacts.sh
748+
shell: bash
669749
env:
670750
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
671751
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,3 @@
4444
[submodule "src/tools/rust-analyzer"]
4545
path = src/tools/rust-analyzer
4646
url = https://github.com/rust-analyzer/rust-analyzer.git
47-
[submodule "src/backtrace"]
48-
path = src/backtrace
49-
url = https://github.com/rust-lang/backtrace-rs.git

0 commit comments

Comments
 (0)