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: fix ci #6391

Merged
merged 7 commits into from
Jul 9, 2024
Merged

chore: fix ci #6391

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
647071a
test
SWvheerden Jul 8, 2024
e857819
test2
SWvheerden Jul 8, 2024
e9a3444
update tool chain
SWvheerden Jul 9, 2024
2834cfc
WIP on fix_ci
SWvheerden Jul 9, 2024
729efbd
remove unused
SWvheerden Jul 9, 2024
3a05257
fix test
SWvheerden Jul 9, 2024
7241adb
comments
SWvheerden Jul 9, 2024
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
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: CI
merge_group:

env:
toolchain: nightly-2024-03-01
toolchain: nightly-2024-07-07
CARGO_HTTP_MULTIPLEXING: false
CARGO_TERM_COLOR: always
CARGO_UNSTABLE_SPARSE_REGISTRY: true
Expand All @@ -32,7 +32,7 @@ concurrency:
jobs:
clippy:
name: clippy
runs-on: [ubuntu-20.04]
runs-on: [ubuntu-latest]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -70,6 +70,9 @@ jobs:
tari-${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-nightly
- name: cargo format
run: cargo fmt --all -- --check
- run: rustup update
- run: rustup default nightly-2024-07-07
- run: rustup update
SWvheerden marked this conversation as resolved.
Show resolved Hide resolved
- name: Install cargo-lints
run: cargo install cargo-lints
- name: Clippy check (with lints)
Expand All @@ -78,7 +81,7 @@ jobs:
machete:
# Checks for unused dependencies.
name: machete
runs-on: [ubuntu-20.04]
runs-on: [ubuntu-latest]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# - the CI files in .github folder
# - the Makefile in base_layer/key_manager/Makefile
[toolchain]
channel = "nightly-2024-03-01"
channel = "nightly-2024-07-07"
Loading