Skip to content

Commit b871769

Browse files
authored
Merge branch 'rust-lang:master' into auto-install-toolchain
2 parents 541a91e + 546fd47 commit b871769

23 files changed

+653
-447
lines changed

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
security_audit:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- id: install
2424
run: |
2525
rustup override set stable

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ jobs:
2525
sqlx:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
29+
30+
# We check that all github actions workflows have valid syntax
31+
- name: Validate YAML file
32+
uses: raven-actions/actionlint@v2
33+
with:
34+
files: .github/workflow/*
35+
flags: "-ignore SC2086" # ignore some shellcheck errors
2936

3037
- name: install `just`
3138
run: sudo snap install --edge --classic just
@@ -69,7 +76,7 @@ jobs:
6976
SQLX_OFFLINE: 1
7077
runs-on: ubuntu-latest
7178
steps:
72-
- uses: actions/checkout@v4
79+
- uses: actions/checkout@v5
7380

7481
- name: restore build & cargo cache
7582
uses: Swatinem/rust-cache@v2
@@ -105,7 +112,7 @@ jobs:
105112
GUI_test:
106113
runs-on: ubuntu-latest
107114
steps:
108-
- uses: actions/checkout@v4
115+
- uses: actions/checkout@v5
109116

110117
- name: restore build & cargo cache
111118
uses: Swatinem/rust-cache@v2
@@ -133,7 +140,7 @@ jobs:
133140
runs-on: ubuntu-latest
134141

135142
steps:
136-
- uses: actions/checkout@v4
143+
- uses: actions/checkout@v5
137144
- name: update rust toolchain
138145
run: rustup component add rustfmt
139146

@@ -144,7 +151,7 @@ jobs:
144151
runs-on: ubuntu-latest
145152

146153
steps:
147-
- uses: actions/checkout@v4
154+
- uses: actions/checkout@v5
148155

149156
- name: update rust toolchain
150157
run: rustup component add clippy
@@ -162,7 +169,7 @@ jobs:
162169
eslint:
163170
runs-on: ubuntu-latest
164171
steps:
165-
- uses: actions/checkout@v4
172+
- uses: actions/checkout@v5
166173
- uses: denoland/setup-deno@v2
167174
- name: install `just`
168175
run: sudo snap install --edge --classic just

.github/workflows/commit-sqlx-changes.yml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,21 @@ env:
1919

2020
permissions:
2121
contents: write
22+
pull-requests: write
2223

2324
jobs:
2425
commit-sqlx-changes:
2526
if: ${{ github.event.pull_request.merged }}
2627
runs-on: ubuntu-latest
28+
outputs:
29+
need_pr: ${{ steps.sqlx_check.outputs.need_pr }}
2730
steps:
28-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
32+
33+
- name: Ensure repository is up to date
34+
run: |
35+
git fetch origin
36+
git rebase origin/master
2937
3038
- name: install `just`
3139
run: sudo snap install --edge --classic just
@@ -52,16 +60,29 @@ jobs:
5260
run: cargo sqlx migrate run --database-url $DOCSRS_DATABASE_URL
5361

5462
- name: Commit sqlx changes on master branch if any
63+
id: sqlx_check
5564
run: |
5665
just sqlx-prepare
5766
# If there are differences in the SQLX files, then we push them on the master branch
5867
if git status --porcelain .sqlx ; then
59-
git config --global user.name 'Docs.rs developers'
60-
git config --global user.email '[email protected]'
61-
git add .sqlx
62-
git commit -m 'Update SQLX files'
63-
git push
68+
echo "need_pr=1" >> "$GITHUB_OUTPUT"
69+
else
70+
echo "need_pr=0" >> "$GITHUB_OUTPUT"
6471
fi
6572
6673
- name: Clean up the database
6774
run: docker compose down --volumes
75+
76+
- name: Open pull request
77+
if: ${{ steps.sqlx_check.outputs.need_pr == '1' }}
78+
uses: peter-evans/create-pull-request@v7
79+
with:
80+
commit-message: Update SQLX files
81+
committer: Docs.rs developers <[email protected]>
82+
author: Docs.rs developers <[email protected]>
83+
signoff: false
84+
delete-branch: true
85+
branch: update-sqlx-pr-${{ github.event.pull_request.number }}
86+
title: Update SQLX files
87+
body: |
88+
Following #${{ github.event.pull_request.number }} changes, here are the related SQLX files changes.

.github/workflows/deploy-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Build and upload docker image
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Build the Docker image
1616
run: docker build -t docs-rs-web -f dockerfiles/Dockerfile --target web-server .

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Production
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313

1414
- name: Build the Docker image
1515
run: docker build -t docs-rs-web -f dockerfiles/Dockerfile --target web-server .

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Test docker image builds
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111

1212
- name: Build the Docker image
1313
run: docker build -t docs-rs -f dockerfiles/Dockerfile .

.sqlx/query-bc0b3932dc2f8bd2b8a9f5a312262eafefd3b80b3322116448901aa55f2d89e7.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)