Skip to content

Commit 98b936c

Browse files
ehussehuss
committed
Try to trim some cruft
1 parent e8d724d commit 98b936c

File tree

4 files changed

+64
-58
lines changed

4 files changed

+64
-58
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -125,29 +125,29 @@ jobs:
125125
- name: ensure the channel matches the target branch
126126
run: src/ci/scripts/verify-channel.sh
127127

128-
- name: collect CPU statistics
129-
run: src/ci/scripts/collect-cpu-stats.sh
128+
# - name: collect CPU statistics
129+
# run: src/ci/scripts/collect-cpu-stats.sh
130130

131131
- name: show the current environment
132132
run: src/ci/scripts/dump-environment.sh
133133

134-
- name: install awscli
135-
run: src/ci/scripts/install-awscli.sh
134+
# - name: install awscli
135+
# run: src/ci/scripts/install-awscli.sh
136136

137137
- name: install sccache
138138
run: src/ci/scripts/install-sccache.sh
139139

140-
- name: select Xcode
141-
run: src/ci/scripts/select-xcode.sh
140+
# - name: select Xcode
141+
# run: src/ci/scripts/select-xcode.sh
142142

143143
- name: install clang
144144
run: src/ci/scripts/install-clang.sh
145145

146-
- name: install tidy
147-
run: src/ci/scripts/install-tidy.sh
146+
# - name: install tidy
147+
# run: src/ci/scripts/install-tidy.sh
148148

149-
- name: install WIX
150-
run: src/ci/scripts/install-wix.sh
149+
# - name: install WIX
150+
# run: src/ci/scripts/install-wix.sh
151151

152152
- name: disable git crlf conversion
153153
run: src/ci/scripts/disable-git-crlf-conversion.sh
@@ -161,8 +161,8 @@ jobs:
161161
- name: install ninja
162162
run: src/ci/scripts/install-ninja.sh
163163

164-
- name: enable ipv6 on Docker
165-
run: src/ci/scripts/enable-docker-ipv6.sh
164+
# - name: enable ipv6 on Docker
165+
# run: src/ci/scripts/enable-docker-ipv6.sh
166166

167167
# Disable automatic line ending conversion (again). On Windows, when we're
168168
# installing dependencies, something switches the git configuration directory or
@@ -172,14 +172,14 @@ jobs:
172172
- name: disable git crlf conversion
173173
run: src/ci/scripts/disable-git-crlf-conversion.sh
174174

175-
- name: ensure line endings are correct
176-
run: src/ci/scripts/verify-line-endings.sh
175+
# - name: ensure line endings are correct
176+
# run: src/ci/scripts/verify-line-endings.sh
177177

178-
- name: ensure backported commits are in upstream branches
179-
run: src/ci/scripts/verify-backported-commits.sh
178+
# - name: ensure backported commits are in upstream branches
179+
# run: src/ci/scripts/verify-backported-commits.sh
180180

181-
- name: ensure the stable version number is correct
182-
run: src/ci/scripts/verify-stable-version-number.sh
181+
# - name: ensure the stable version number is correct
182+
# run: src/ci/scripts/verify-stable-version-number.sh
183183

184184
- name: Download Handle
185185
run: |
@@ -210,41 +210,41 @@ jobs:
210210
# if-no-files-found: ignore
211211
# retention-days: 5
212212

213-
- name: upload artifacts to S3
214-
run: src/ci/scripts/upload-artifacts.sh
215-
env:
216-
AWS_ACCESS_KEY_ID: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
217-
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
218-
# Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
219-
# builders *should* have the AWS credentials available. Still, explicitly
220-
# adding the condition is helpful as this way CI will not silently skip
221-
# deploying artifacts from a dist builder if the variables are misconfigured,
222-
# erroring about invalid credentials instead.
223-
if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1'
213+
# - name: upload artifacts to S3
214+
# run: src/ci/scripts/upload-artifacts.sh
215+
# env:
216+
# AWS_ACCESS_KEY_ID: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
217+
# AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
218+
# # Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
219+
# # builders *should* have the AWS credentials available. Still, explicitly
220+
# # adding the condition is helpful as this way CI will not silently skip
221+
# # deploying artifacts from a dist builder if the variables are misconfigured,
222+
# # erroring about invalid credentials instead.
223+
# if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1'
224224

225225
# This job isused to tell bors the final status of the build, as there is no practical way to detect
226226
# when a workflow is successful listening to webhooks only in our current bors implementation (homu).
227-
outcome:
228-
name: bors build finished
229-
runs-on: ubuntu-latest
230-
needs: [ calculate_matrix, job ]
231-
# !cancelled() executes the job regardless of whether the previous jobs passed or failed
232-
if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
233-
steps:
234-
- name: checkout the source code
235-
uses: actions/checkout@v4
236-
with:
237-
fetch-depth: 2
238-
# Calculate the exit status of the whole CI workflow.
239-
# If all dependent jobs were successful, this exits with 0 (and the outcome job continues successfully).
240-
# If a some dependent job has failed, this exits with 1.
241-
- name: calculate the correct exit status
242-
run: jq --exit-status 'all(.result == "success" or .result == "skipped")' <<< '${{ toJson(needs) }}'
243-
# Publish the toolstate if an auto build succeeds (just before push to master)
244-
- name: publish toolstate
245-
run: src/ci/publish_toolstate.sh
246-
shell: bash
247-
if: needs.calculate_matrix.outputs.run_type == 'auto'
248-
env:
249-
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
250-
TOOLSTATE_PUBLISH: 1
227+
# outcome:
228+
# name: bors build finished
229+
# runs-on: ubuntu-latest
230+
# needs: [ calculate_matrix, job ]
231+
# # !cancelled() executes the job regardless of whether the previous jobs passed or failed
232+
# if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
233+
# steps:
234+
# - name: checkout the source code
235+
# uses: actions/checkout@v4
236+
# with:
237+
# fetch-depth: 2
238+
# # Calculate the exit status of the whole CI workflow.
239+
# # If all dependent jobs were successful, this exits with 0 (and the outcome job continues successfully).
240+
# # If a some dependent job has failed, this exits with 1.
241+
# - name: calculate the correct exit status
242+
# run: jq --exit-status 'all(.result == "success" or .result == "skipped")' <<< '${{ toJson(needs) }}'
243+
# # Publish the toolstate if an auto build succeeds (just before push to master)
244+
# - name: publish toolstate
245+
# run: src/ci/publish_toolstate.sh
246+
# shell: bash
247+
# if: needs.calculate_matrix.outputs.run_type == 'auto'
248+
# env:
249+
# TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
250+
# TOOLSTATE_PUBLISH: 1

‎src/bootstrap/src/core/build_steps/test.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ impl Step for Cargo {
294294
let compiler = builder.compiler(self.stage, self.host);
295295

296296
builder.ensure(tool::Cargo { compiler, target: self.host });
297-
let cargo = tool::prepare_tool_cargo(
297+
let mut cargo = tool::prepare_tool_cargo(
298298
builder,
299299
compiler,
300300
Mode::ToolRustc,
@@ -304,6 +304,7 @@ impl Step for Cargo {
304304
SourceType::Submodule,
305305
&[],
306306
);
307+
cargo.arg("--no-run");
307308

308309
// NOTE: can't use `run_cargo_test` because we need to overwrite `PATH`
309310
let mut cargo = prepare_cargo_test(cargo, &[], &[], "cargo", compiler, self.host, builder);

‎src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools2.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ set -x # so one can see where we are in the script
66

77
X_PY="$1"
88

9+
python3 "$X_PY" --stage 2 test src/tools/cargo -- --no-run
10+
python3 "$X_PY" --stage 2 build src/tools/cargo
11+
912
# Try to test the toolstate-tracked tools and store the build/test success in the TOOLSTATE_FILE.
1013

1114
# Pre-build the compiler and the library first to output a better error message when the build

‎src/ci/github-actions/jobs.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,18 @@ envs:
8282
pr:
8383
- image: x86_64-msvc-ext1
8484
env:
85-
SCRIPT: python x.py --stage 2 test src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools2.sh x.py /tmp/toolstate/toolstates.json windows
85+
CODEGEN_BACKENDS: llvm
86+
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools2.sh x.py /tmp/toolstate/toolstates.json windows
8687
HOST_TARGET: x86_64-pc-windows-msvc
87-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json --set build.cargo=C:/a/rust/rust/cargo.exe
88+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json --set build.cargo=C:/a/rust/rust/cargo.exe
8889
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
8990
<<: *job-windows-8c
9091
- image: x86_64-msvc-ext2
9192
env:
92-
SCRIPT: python x.py --stage 2 test src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools2.sh x.py /tmp/toolstate/toolstates.json windows
93+
CODEGEN_BACKENDS: llvm
94+
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools2.sh x.py /tmp/toolstate/toolstates.json windows
9395
HOST_TARGET: x86_64-pc-windows-msvc
94-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json --set build.cargo=C:/a/rust/rust/cargo.exe
96+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json --set build.cargo=C:/a/rust/rust/cargo.exe
9597
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
9698
<<: *job-windows-8c
9799

0 commit comments

Comments
 (0)