Skip to content

Commit c7cb952

Browse files
committed
Remove master CI job
1 parent c36d78e commit c7cb952

File tree

2 files changed

+8
-37
lines changed

2 files changed

+8
-37
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,28 +152,10 @@ jobs:
152152
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
153153
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
154154
if: "success() && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
155-
master:
156-
name: master
157-
runs-on: ubuntu-latest
158-
env:
159-
SCCACHE_BUCKET: rust-lang-ci-sccache2
160-
DEPLOY_BUCKET: rust-lang-ci2
161-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
162-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
163-
TOOLSTATE_PUBLISH: 1
164-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
165-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
166-
AWS_REGION: us-west-1
167-
CACHE_DOMAIN: ci-caches.rust-lang.org
168-
if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
169-
steps:
170-
- name: checkout the source code
171-
uses: actions/checkout@v4
172-
with:
173-
fetch-depth: 2
174155
- name: publish toolstate
175156
run: src/ci/publish_toolstate.sh
176157
shell: bash
158+
if: "success() && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1') && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
177159
env:
178160
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
179161
try-success:

src/ci/github-actions/ci.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,13 @@ x--expand-yaml-anchors--remove:
253253
# erroring about invalid credentials instead.
254254
if: success() && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')
255255

256+
- name: publish toolstate
257+
run: src/ci/publish_toolstate.sh
258+
shell: bash
259+
if: success() && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1') && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'
260+
env:
261+
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
262+
256263
# These snippets are used by the try-success, try-failure, auto-success and auto-failure jobs.
257264
# Check out their documentation for more information on why they're needed.
258265

@@ -351,24 +358,6 @@ jobs:
351358
# This hack is taken from https://github.com/ferrocene/ferrocene/blob/d43edc6b7697cf1719ec1c17c54904ab94825763/.github/workflows/release.yml#L75-L82
352359
if: fromJSON(needs.calculate_matrix.outputs.jobs)[0] != null
353360

354-
master:
355-
name: master
356-
runs-on: ubuntu-latest
357-
env:
358-
<<: [*prod-variables]
359-
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'
360-
steps:
361-
- name: checkout the source code
362-
uses: actions/checkout@v4
363-
with:
364-
fetch-depth: 2
365-
366-
- name: publish toolstate
367-
run: src/ci/publish_toolstate.sh
368-
shell: bash
369-
env:
370-
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
371-
372361
# These jobs don't actually test anything, but they're used to tell bors the
373362
# build completed, as there is no practical way to detect when a workflow is
374363
# successful listening to webhooks only.

0 commit comments

Comments
 (0)