Skip to content

Commit 91620e8

Browse files
authored
Merge branch 'master' into issue-2848
2 parents 5893916 + 3ced044 commit 91620e8

Some content is hidden

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

53 files changed

+1715
-856
lines changed

.cirrus.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This is ci/actions-templates/linux-builds-template.yaml
2+
# Do not edit this file in .cirrus.yml
3+
4+
task:
5+
name: FreeBSD
6+
freebsd_instance:
7+
image: freebsd-13-0-release-amd64
8+
setup_script: |
9+
pkg install -y git gmake bash
10+
echo "========="
11+
echo "create non-root user and log into it"
12+
pw group add -n tester
13+
pw user add -n tester -g tester -s `which bash`
14+
pw user mod tester -d `pwd`
15+
chown -R tester .
16+
sudo -u tester bash ci/cirrus-templates/script.bash

.github/workflows/centos-fmt-clippy-on-all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
8888
- name: Run formatting checks
8989
run: |
90-
cargo fmt --all -- --check
90+
cargo fmt --all --check
9191
- name: Run cargo check and clippy
9292
run: |
9393
cargo check --all --all-targets

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ APIs, we should behave well if we can.
152152
Producing the final release artifacts is a bit involved because of the way
153153
Rustup is distributed. The steps for a release are:
154154

155-
1. Update all `Cargo.toml` to have the new version
155+
1. Update `Cargo.toml` and `download/Cargo.toml`to have the same new version
156156
(optionally make a commit)
157157
2. Run `cargo build` and review `Cargo.lock` changes
158158
if all looks well, make a commit

0 commit comments

Comments
 (0)