Skip to content

Commit 4918bfa

Browse files
committed
Try dist-powerpc64-linux
1 parent 461e807 commit 4918bfa

File tree

2 files changed

+21
-137
lines changed

2 files changed

+21
-137
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -29,121 +29,6 @@ defaults:
2929
run:
3030
shell: bash
3131
jobs:
32-
pr:
33-
name: PR
34-
env:
35-
CI_JOB_NAME: "${{ matrix.name }}"
36-
SCCACHE_BUCKET: rust-lang-ci-sccache2
37-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
38-
CACHE_DOMAIN: ci-caches.rust-lang.org
39-
if: "github.event_name == 'pull_request'"
40-
strategy:
41-
matrix:
42-
include:
43-
- name: mingw-check
44-
os: ubuntu-20.04-xl
45-
env: {}
46-
- name: x86_64-gnu-llvm-12
47-
os: ubuntu-20.04-xl
48-
env: {}
49-
- name: x86_64-gnu-tools
50-
env:
51-
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
52-
os: ubuntu-20.04-xl
53-
timeout-minutes: 600
54-
runs-on: "${{ matrix.os }}"
55-
steps:
56-
- name: disable git crlf conversion
57-
run: git config --global core.autocrlf false
58-
- name: checkout the source code
59-
uses: actions/checkout@v2
60-
with:
61-
fetch-depth: 2
62-
- name: configure the PR in which the error message will be posted
63-
run: "echo \"[CI_PR_NUMBER=$num]\""
64-
env:
65-
num: "${{ github.event.number }}"
66-
if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
67-
- name: add extra environment variables
68-
run: src/ci/scripts/setup-environment.sh
69-
env:
70-
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
71-
if: success() && !env.SKIP_JOB
72-
- name: decide whether to skip this job
73-
run: src/ci/scripts/should-skip-this.sh
74-
if: success() && !env.SKIP_JOB
75-
- name: ensure the channel matches the target branch
76-
run: src/ci/scripts/verify-channel.sh
77-
if: success() && !env.SKIP_JOB
78-
- name: configure GitHub Actions to kill the build when outdated
79-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
80-
with:
81-
github_token: "${{ secrets.github_token }}"
82-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
83-
- name: collect CPU statistics
84-
run: src/ci/scripts/collect-cpu-stats.sh
85-
if: success() && !env.SKIP_JOB
86-
- name: show the current environment
87-
run: src/ci/scripts/dump-environment.sh
88-
if: success() && !env.SKIP_JOB
89-
- name: install awscli
90-
run: src/ci/scripts/install-awscli.sh
91-
if: success() && !env.SKIP_JOB
92-
- name: install sccache
93-
run: src/ci/scripts/install-sccache.sh
94-
if: success() && !env.SKIP_JOB
95-
- name: install clang
96-
run: src/ci/scripts/install-clang.sh
97-
if: success() && !env.SKIP_JOB
98-
- name: install WIX
99-
run: src/ci/scripts/install-wix.sh
100-
if: success() && !env.SKIP_JOB
101-
- name: ensure the build happens on a partition with enough space
102-
run: src/ci/scripts/symlink-build-dir.sh
103-
if: success() && !env.SKIP_JOB
104-
- name: disable git crlf conversion
105-
run: src/ci/scripts/disable-git-crlf-conversion.sh
106-
if: success() && !env.SKIP_JOB
107-
- name: checkout submodules
108-
run: src/ci/scripts/checkout-submodules.sh
109-
if: success() && !env.SKIP_JOB
110-
- name: install MSYS2
111-
run: src/ci/scripts/install-msys2.sh
112-
if: success() && !env.SKIP_JOB
113-
- name: install MinGW
114-
run: src/ci/scripts/install-mingw.sh
115-
if: success() && !env.SKIP_JOB
116-
- name: install ninja
117-
run: src/ci/scripts/install-ninja.sh
118-
if: success() && !env.SKIP_JOB
119-
- name: enable ipv6 on Docker
120-
run: src/ci/scripts/enable-docker-ipv6.sh
121-
if: success() && !env.SKIP_JOB
122-
- name: disable git crlf conversion
123-
run: src/ci/scripts/disable-git-crlf-conversion.sh
124-
if: success() && !env.SKIP_JOB
125-
- name: ensure line endings are correct
126-
run: src/ci/scripts/verify-line-endings.sh
127-
if: success() && !env.SKIP_JOB
128-
- name: ensure backported commits are in upstream branches
129-
run: src/ci/scripts/verify-backported-commits.sh
130-
if: success() && !env.SKIP_JOB
131-
- name: ensure the stable version number is correct
132-
run: src/ci/scripts/verify-stable-version-number.sh
133-
if: success() && !env.SKIP_JOB
134-
- name: run the build
135-
run: src/ci/scripts/run-build-from-ci.sh
136-
env:
137-
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
138-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
139-
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
140-
if: success() && !env.SKIP_JOB
141-
- name: upload artifacts to S3
142-
run: src/ci/scripts/upload-artifacts.sh
143-
env:
144-
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
145-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
146-
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
14732
auto:
14833
name: auto
14934
env:
@@ -558,7 +443,7 @@ jobs:
558443
strategy:
559444
matrix:
560445
include:
561-
- name: dist-x86_64-linux
446+
- name: dist-powerpc64-linux
562447
os: ubuntu-20.04-xl
563448
env: {}
564449
timeout-minutes: 600

src/ci/github-actions/ci.yml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -276,25 +276,25 @@ defaults:
276276
shell: bash
277277

278278
jobs:
279-
pr:
280-
<<: *base-ci-job
281-
name: PR
282-
env:
283-
<<: [*shared-ci-variables, *public-variables]
284-
if: github.event_name == 'pull_request'
285-
strategy:
286-
matrix:
287-
include:
288-
- name: mingw-check
289-
<<: *job-linux-xl
290-
291-
- name: x86_64-gnu-llvm-12
292-
<<: *job-linux-xl
293-
294-
- name: x86_64-gnu-tools
295-
env:
296-
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
297-
<<: *job-linux-xl
279+
# pr:
280+
# <<: *base-ci-job
281+
# name: PR
282+
# env:
283+
# <<: [*shared-ci-variables, *public-variables]
284+
# if: github.event_name == 'pull_request'
285+
# strategy:
286+
# matrix:
287+
# include:
288+
# - name: mingw-check
289+
# <<: *job-linux-xl
290+
291+
# - name: x86_64-gnu-llvm-12
292+
# <<: *job-linux-xl
293+
294+
# - name: x86_64-gnu-tools
295+
# env:
296+
# CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
297+
# <<: *job-linux-xl
298298

299299
auto:
300300
<<: *base-ci-job
@@ -691,8 +691,7 @@ jobs:
691691
strategy:
692692
matrix:
693693
include:
694-
- &dist-x86_64-linux
695-
name: dist-x86_64-linux
694+
- name: dist-powerpc64-linux
696695
<<: *job-linux-xl
697696

698697
master:

0 commit comments

Comments
 (0)