Commit 2242436

compiler-errorscuviper

authored and

committed

Revert "switch to the macos-12-xl builder"

This reverts commit fcbae98.

1 parent 30e7b05 commit 2242436Copy full SHA for 2242436

File tree

2 files changed

-7

lines changed

.github/workflows
- ci.yml
src/ci/github-actions
- ci.yml

2 files changed

-7

lines changed

`‎.github/workflows/ci.yml`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ jobs:`
`309`	`309`	`NO_DEBUG_ASSERTIONS: 1`
`310`	`310`	`NO_OVERFLOW_CHECKS: 1`
`311`	`311`	`DIST_REQUIRE_ALL_TOOLS: 1`
`312`		`- os: macos-12-xl`
	`312`	`+ os: macos-latest`
`313`	`313`	`- name: dist-apple-various`
`314`	`314`	`env:`
`315`	`315`	`SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"`
`@@ -320,7 +320,7 @@ jobs:`
`320`	`320`	`NO_LLVM_ASSERTIONS: 1`
`321`	`321`	`NO_DEBUG_ASSERTIONS: 1`
`322`	`322`	`NO_OVERFLOW_CHECKS: 1`
`323`		`- os: macos-12-xl`
	`323`	`+ os: macos-latest`
`324`	`324`	`- name: dist-x86_64-apple-alt`
`325`	`325`	`env:`
`326`	`326`	`SCRIPT: "./x.py dist bootstrap --include-default-paths"`
`@@ -331,7 +331,7 @@ jobs:`
`331`	`331`	`NO_LLVM_ASSERTIONS: 1`
`332`	`332`	`NO_DEBUG_ASSERTIONS: 1`
`333`	`333`	`NO_OVERFLOW_CHECKS: 1`
`334`		`- os: macos-12-xl`
	`334`	`+ os: macos-latest`
`335`	`335`	`- name: x86_64-apple-1`
`336`	`336`	`env:`
`337`	`337`	`SCRIPT: "./x.py --stage 2 test --exclude src/test/ui --exclude src/test/rustdoc --exclude src/test/run-make-fulldeps"`
`@@ -342,7 +342,7 @@ jobs:`
`342`	`342`	`NO_LLVM_ASSERTIONS: 1`
`343`	`343`	`NO_DEBUG_ASSERTIONS: 1`
`344`	`344`	`NO_OVERFLOW_CHECKS: 1`
`345`		`- os: macos-12-xl`
	`345`	`+ os: macos-latest`
`346`	`346`	`- name: x86_64-apple-2`
`347`	`347`	`env:`
`348`	`348`	`SCRIPT: "./x.py --stage 2 test src/test/ui src/test/rustdoc src/test/run-make-fulldeps"`
`@@ -353,7 +353,7 @@ jobs:`
`353`	`353`	`NO_LLVM_ASSERTIONS: 1`
`354`	`354`	`NO_DEBUG_ASSERTIONS: 1`
`355`	`355`	`NO_OVERFLOW_CHECKS: 1`
`356`		`- os: macos-12-xl`
	`356`	`+ os: macos-latest`
`357`	`357`	`- name: dist-aarch64-apple`
`358`	`358`	`env:`
`359`	`359`	`SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"`
`@@ -368,7 +368,7 @@ jobs:`
`368`	`368`	`NO_OVERFLOW_CHECKS: 1`
`369`	`369`	`DIST_REQUIRE_ALL_TOOLS: 1`
`370`	`370`	`JEMALLOC_SYS_WITH_LG_PAGE: 14`
`371`		`- os: macos-12-xl`
	`371`	`+ os: macos-latest`
`372`	`372`	`- name: x86_64-msvc-1`
`373`	`373`	`env:`
`374`	`374`	`RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ x--expand-yaml-anchors--remove:`
`77`	`77`	`<<: *base-job`
`78`	`78`
`79`	`79`	`- &job-macos-xl`
`80`		`- os: macos-12-xl`
	`80`	`+ os: macos-latest # We don't have an XL builder for this`
`81`	`81`	`<<: *base-job`
`82`	`82`
`83`	`83`	`- &job-windows-xl`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2242436

File tree

2 files changed

2 files changed

`‎.github/workflows/ci.yml`

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

0 commit comments