Skip to content

Commit aa22330

Browse files
authored
Merge branch 'master' into abi
2 parents 9f6b96e + 9e55101 commit aa22330

File tree

1,103 files changed

+11512
-10020
lines changed

Some content is hidden

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

1,103 files changed

+11512
-10020
lines changed

.github/ISSUE_TEMPLATE/ice.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ http://blog.pnkfx.org/blog/2019/11/18/rust-bug-minimization-patterns/
1414

1515
### Code
1616

17-
```
17+
```Rust
1818
<code>
1919
```
2020

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
6464
with:
6565
github_token: "${{ secrets.github_token }}"
66-
if: success() && !env.SKIP_JOB
66+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6767
- name: add extra environment variables
6868
run: src/ci/scripts/setup-environment.sh
6969
env:
@@ -196,7 +196,7 @@ jobs:
196196
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
197197
with:
198198
github_token: "${{ secrets.github_token }}"
199-
if: success() && !env.SKIP_JOB
199+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
200200
- name: add extra environment variables
201201
run: src/ci/scripts/setup-environment.sh
202202
env:
@@ -626,7 +626,7 @@ jobs:
626626
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
627627
with:
628628
github_token: "${{ secrets.github_token }}"
629-
if: success() && !env.SKIP_JOB
629+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
630630
- name: add extra environment variables
631631
run: src/ci/scripts/setup-environment.sh
632632
env:

0 commit comments

Comments
 (0)