Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: correct the MSRV check #934

Merged
merged 3 commits into from
Aug 18, 2020
Merged

chore: correct the MSRV check #934

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db1a813
chore: override toolchain to correct MSRV
JohnTitor Aug 16, 2020
ab474c0
chore fix actions/checkout's branch name
JohnTitor Aug 16, 2020
68aeb28
Change configured MSRV from 1.44 to 1.40
hawkw Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [stable, 1.39.0]
rust: [stable, 1.40.0]
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a slight preference for making the change from master -> main in a separate branch so that the git history is clearer, but it's not a big deal.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1. I believe that changing this now would close all open PRs on tracing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, this branch is actions/checkout's, not tracing's. We use actions/checkout (https://github.com/actions/checkout) to checkout on GHA and we're currently using master. But on that repo, they, i.e., GitHub renamed their default branch to main. So this change is reasonable.

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
- name: Check
uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -66,11 +67,12 @@ jobs:
#- tracing
#- tracing-subscriber
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: Fetch latest release version of cargo-hack
run: |
mkdir -p .github/caching
Expand Down Expand Up @@ -102,11 +104,12 @@ jobs:
- std log-always
- std
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: cargo check
working-directory: tracing
run: cargo check --no-default-features --features "${{ matrix.featureset }}"
Expand All @@ -126,11 +129,12 @@ jobs:
- registry
- env-filter
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: cargo check
working-directory: tracing-subscriber
run: cargo check --no-default-features --features "${{ matrix.featureset }}"
Expand All @@ -141,13 +145,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [stable, beta, nightly, 1.39.0]
rust: [stable, beta, nightly, 1.40.0]
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
profile: minimal
override: true
- name: Run tests
uses: actions-rs/cargo@v1
with:
Expand All @@ -162,11 +167,12 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: Run tests
uses: actions-rs/cargo@v1
with:
Expand All @@ -178,11 +184,12 @@ jobs:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: "Test log support"
run: (cd tracing/test-log-support && cargo test)
- name: "Test static max level"
Expand All @@ -196,12 +203,13 @@ jobs:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt
profile: minimal
override: true
- name: rustfmt
uses: actions-rs/cargo@v1
with:
Expand All @@ -212,7 +220,7 @@ jobs:
# Check for any warnings. This is informational and thus is allowed to fail.
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand All @@ -227,7 +235,7 @@ jobs:
cargo-audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@main
- name: Fetch latest release version of cargo-audit
run: |
mkdir -p .github/caching
Expand Down