Skip to content

Commit 71cab61

Browse files
committed
Merge remote-tracking branch 'origin/main' into future-main
2 parents 62ce79f + fae176e commit 71cab61

15 files changed

+776
-79
lines changed

.github/assets/msrv-badge.svg

+1
Loading

.github/labeler.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
changelog-updated:
2+
- CHANGELOG.md
3+
4+
msrv-updated:
5+
- .github/assets/msrv-badge.svg

.github/workflows/ci.yml

+20-12
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,29 @@ jobs:
2828
- name: Build
2929
subcommand: build --release --all-features --verbose
3030
steps:
31-
- uses: actions/checkout@v2
32-
- name: Stable with rustfmt and clippy
33-
uses: actions-rs/toolchain@v1
34-
with:
35-
profile: minimal
36-
toolchain: stable
37-
components: rustfmt, clippy
38-
- uses: Swatinem/rust-cache@v1
39-
- name: cargo check - ${{ matrix.cargo_checks.name }}
40-
run: cargo ${{ matrix.cargo_checks.subcommand }}
31+
- uses: actions/checkout@v2
32+
- name: Stable with rustfmt and clippy
33+
uses: actions-rs/toolchain@v1
34+
with:
35+
profile: minimal
36+
toolchain: stable
37+
components: rustfmt, clippy
38+
- uses: Swatinem/rust-cache@v1
39+
- name: cargo check - ${{ matrix.cargo_checks.name }}
40+
run: cargo ${{ matrix.cargo_checks.subcommand }}
41+
42+
update-project-stuff:
43+
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
44+
uses: ./.github/workflows/update-repo-stuff.yml
45+
secrets: inherit
46+
4147
done:
4248
name: Done
4349
if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
44-
needs: [ci]
50+
needs:
51+
- ci
52+
- update-project-stuff
4553
runs-on: ubuntu-latest
4654
steps:
4755
- name: Done
48-
run: echo "Done!"
56+
run: echo "Done!"

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish
22

33
on:
44
# push:
5-
# branches: [master]
5+
# branches: [main]
66
workflow_dispatch:
77

88
jobs:

.github/workflows/triage_pr.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: "Triage PR"
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
10+
jobs:
11+
validate_pr_title:
12+
name: Validate PR title
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: amannn/action-semantic-pull-request@v4
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
with:
19+
ignoreLabels: |
20+
bot-updated
21+
ignore-semantic-pull-request
22+
label_pr:
23+
name: Label Pull Request
24+
runs-on: ubuntu-latest
25+
permissions:
26+
contents: read
27+
pull-requests: write
28+
steps:
29+
- uses: actions/labeler@v4
30+
with:
31+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
32+
sync-labels: true

0 commit comments

Comments
 (0)