Skip to content

Commit

Permalink
Rolling back into single run as we can't pull out nightly from tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
sacherjj committed Jan 14, 2025
1 parent 2b2754d commit 6f8c494
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 68 deletions.
49 changes: 0 additions & 49 deletions .github/workflows/casper-node-nightly.yml

This file was deleted.

13 changes: 11 additions & 2 deletions .github/workflows/casper-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,20 @@ jobs:
with:
persist-credentials: false

- name: setup-wo-nightly
run: make setup-wo-nightly
- name: setup
run: make setup

- uses: Swatinem/rust-cache@v2

- name: check-format
run: make check-format

- name: doc
run: make doc

- name: lint
run: make lint

- name: audit
run: make audit

Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 8 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,23 +173,16 @@ bench: build-contracts-rs
setup-cargo-packagers:
$(CARGO) install cargo-deb || exit 0

.PHONY: setup
setup: setup-rs

.PHONY: setup-rs
setup-rs: setup-wo-nightly setup-nightly-rs

.PHONY: setup-wo-nightly
setup-wo-nightly:
setup-rs:
$(RUSTUP) update
$(RUSTUP) toolchain install $(PINNED_STABLE)
$(RUSTUP) toolchain install $(PINNED_STABLE) $(PINNED_NIGHTLY)
$(RUSTUP) target add --toolchain $(PINNED_STABLE) wasm32-unknown-unknown
$(RUSTUP) component add clippy-preview
$(CARGO) install cargo-audit

.PHONY: setup-nightly-rs
setup-nightly-rs:
$(RUSTUP) update
$(RUSTUP) toolchain install $(PINNED_NIGHTLY)
$(RUSTUP) target add --toolchain $(PINNED_NIGHTLY) wasm32-unknown-unknown
$(RUSTUP) component add --toolchain $(PINNED_NIGHTLY) rustfmt clippy-preview
$(RUSTUP) component add --toolchain $(PINNED_STABLE) clippy-preview
$(CARGO) install cargo-audit

.PHONY: setup
setup: setup-rs

0 comments on commit 6f8c494

Please sign in to comment.