Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d140e26

Browse files
committedSep 22, 2024
Merge remote-tracking branch 'upstream/master' into rustup
2 parents 249210e + abdf173 commit d140e26

File tree

253 files changed

+6499
-1645
lines changed

Some content is hidden

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

253 files changed

+6499
-1645
lines changed
 

‎.github/deploy.sh‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@ if [[ $BETA = "true" ]]; then
2525
fi
2626

2727
# Generate version index that is shown as root index page
28-
cp util/gh-pages/versions.html out/index.html
29-
30-
echo "Making the versions.json file"
31-
python3 ./util/versions.py out
28+
python3 ./util/versions.py ./util/gh-pages/versions.html out
3229

3330
# Now let's go have some fun with the cloned repo
3431
cd out
3532
git config user.name "GHA CI"
3633
git config user.email "gha@ci.invalid"
3734

35+
git status
36+
3837
if [[ -n $TAG_NAME ]]; then
3938
# track files, so that the following check works
4039
git add --intent-to-add "$TAG_NAME"
@@ -46,8 +45,6 @@ if [[ -n $TAG_NAME ]]; then
4645
git add "$TAG_NAME"
4746
# Update the symlink
4847
git add stable
49-
# Update versions file
50-
git add versions.json
5148
git commit -m "Add documentation for ${TAG_NAME} release: ${SHA}"
5249
elif [[ $BETA = "true" ]]; then
5350
if git diff --exit-code --quiet -- beta/; then

‎.github/workflows/clippy_bors.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
163163
164164
- name: Upload Binaries
165-
uses: actions/upload-artifact@v3
165+
uses: actions/upload-artifact@v4
166166
with:
167167
name: binaries
168168
path: target/debug
@@ -202,7 +202,7 @@ jobs:
202202

203203
# Download
204204
- name: Download target dir
205-
uses: actions/download-artifact@v3
205+
uses: actions/download-artifact@v4
206206
with:
207207
name: binaries
208208
path: target/debug

0 commit comments

Comments
 (0)
Please sign in to comment.