Skip to content

Commit

Permalink
Merge branch 'rust-lang:master' into self-uninstall-remove-toolchains
Browse files Browse the repository at this point in the history
  • Loading branch information
Lea Fairbanks committed Feb 25, 2023
2 parents 600e57b + fe90448 commit 10e3130
Show file tree
Hide file tree
Showing 191 changed files with 10,036 additions and 7,146 deletions.
16 changes: 16 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This is ci/actions-templates/linux-builds-template.yaml
# Do not edit this file in .cirrus.yml

task:
name: FreeBSD
freebsd_instance:
image: freebsd-13-0-release-amd64
setup_script: |
pkg install -y git gmake bash
echo "========="
echo "create non-root user and log into it"
pw group add -n tester
pw user add -n tester -g tester -s `which bash`
pw user mod tester -d `pwd`
chown -R tester .
sudo -u tester bash ci/cirrus-templates/script.bash
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
26 changes: 0 additions & 26 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Bug report
description: Create a report to help us improve
labels: [bug]
body:
- type: markdown
attributes:
value: >
**Thanks for filing a 🐛 bug report 😄!**
- type: textarea
id: problem
attributes:
label: Problem
description: >
A clear and concise description of what the bug is,
including what currently happens and what you expected to happen.
validations:
required: true

- type: textarea
id: steps
attributes:
label: Steps
description: The steps to reproduce the bug.
placeholder: |
1.
2.
3.
validations:
required: true

- type: textarea
id: solutions
attributes:
label: Possible Solution(s)
description: >
Not obligatory, but suggest a fix/reason for the bug,
or ideas how to implement the addition or change.
- type: textarea
id: notes
attributes:
label: Notes

- type: textarea
id: version
attributes:
label: Rustup version
description: Output of `rustup --version`
render: console
validations:
required: true

- type: textarea
id: toolchains
attributes:
label: Installed toolchains
description: Output of `rustup show`
render: console
validations:
required: true
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/enhancement_request.md

This file was deleted.

33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Enhancement request
description: Suggest an enhancement for this project
labels: [enhancement]
body:
- type: markdown
attributes:
value: >
**Thanks for filing an 🙋 enhancement request 😄!**
- type: textarea
id: problem
attributes:
label: Problem you are trying to solve
description: >
A clear and concise description of the problem this enhancement request is trying to solve.
validations:
required: true

- type: textarea
id: solution
attributes:
label: Solution you'd like
description: >
A clear and concise description of what you want to happen.
validations:
required: true

- type: textarea
id: notes
attributes:
label: Notes
description: >
Any additional context or information you feel may be relevant to the issue.
55 changes: 0 additions & 55 deletions .github/ISSUE_TEMPLATE/wsl_panic.md

This file was deleted.

89 changes: 89 additions & 0 deletions .github/ISSUE_TEMPLATE/wsl_panic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: I am experiencing a panic on WSL
description: Report a panic when using Rustup on WSL
labels: [bug]
body:
- type: markdown
attributes:
value: >
Please read the following very carefully and decide if you
actually need to file this bug...
WSL, specifically WSL 1, has a limitation where glibc 2.31 and
newer will panic, fundamentally the panic will look something
like the following:
thread 'main' panicked at 'assertion failed: `(left == right)`
left: `22`,
right: `4`', src/libstd/sys/unix/thread.rs:166:21
This is a bug, but it's a bug in WSL, not in Rust/Rustup and will
affect other programs built with Rust too. Working around it
with Rustup will not help you until WSL (or glibc) is fixed.
This is known to affect:
* Ubuntu 20.04
* Arch Linux
But it may affect other versions of Linux on WSL1.
You can find more information on the WSL bug report
[here](https://github.com/microsoft/WSL/issues/4898).
If you're CERTAIN that you're not reporting yet another duplicate
of the above issue, then...
**Thanks for filing a 🐛 bug report 😄!**
- type: textarea
id: problem
attributes:
label: Problem
description: >
A clear and concise description of what the bug is,
including what currently happens and what you expected to happen.
validations:
required: true

- type: textarea
id: steps
attributes:
label: Steps
description: The steps to reproduce the bug.
placeholder: |
1.
2.
3.
validations:
required: true

- type: textarea
id: solutions
attributes:
label: Possible Solution(s)
description: >
Not obligatory, but suggest a fix/reason for the bug,
or ideas how to implement the addition or change.
- type: textarea
id: notes
attributes:
label: Notes

- type: textarea
id: version
attributes:
label: Rustup version
description: Output of `rustup --version`
render: console
validations:
required: true

- type: textarea
id: toolchains
attributes:
label: Installed toolchains
description: Output of `rustup show`
render: console
validations:
required: true
20 changes: 20 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
],
"labels": [
"dependencies"
],
"lockFileMaintenance": {
"enabled": true
},
"prCreation": "not-pending",
"rangeStrategy": "replace",
"stabilityDays": 3,
"github-actions": {
"fileMatch": [
"^ci\\/.*/[^/]+\\.ya?ml$"
]
}
}
19 changes: 10 additions & 9 deletions .github/workflows/centos-fmt-clippy-on-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
branches:
- master
- stable
- renovate/*
schedule:
- cron: "30 0 * * 1" # Every Monday at half past midnight

Expand All @@ -21,7 +22,7 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
# v2 defaults to a shallow checkout, but we need at least to the previous tag
fetch-depth: 0
Expand All @@ -39,7 +40,7 @@ jobs:
run: |
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- name: Cache cargo registry and git trees
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
Expand All @@ -48,10 +49,10 @@ jobs:
- name: Get rustc commit hash
id: cargo-target-cache
run: |
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
echo "{rust_hash}={$(rustc -Vv | grep commit-hash | awk '{print $2}')}" >> $GITHUB_OUTPUT
shell: bash
- name: Cache cargo build
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: target
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ runner.os }}-cargo-clippy-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
Expand All @@ -78,16 +79,16 @@ jobs:
--tty \
--init \
--rm \
centos:6 \
centos:7 \
sh ./ci/raw_init.sh
- name: Run shell checks
run: |
shellcheck -s dash -- rustup-init.sh
git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090
git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
shellcheck -x -s dash -- rustup-init.sh
git ls-files -- '*.sh' | xargs shellcheck -x -s dash
git ls-files -- '*.bash' | xargs shellcheck -x -s bash
- name: Run formatting checks
run: |
cargo fmt --all -- --check
cargo fmt --all --check
- name: Run cargo check and clippy
run: |
cargo check --all --all-targets
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install mdbook
Expand Down
Loading

0 comments on commit 10e3130

Please sign in to comment.