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.

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

Update all Cargo.toml files to use workspace dependency versions #6501

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
34 changes: 23 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ concurrency:
env:
CARGO_TERM_COLOR: always
REGISTRY: ghcr.io
RUST_VERSION: 1.79.0
NIGHTLY_RUST_VERSION: nightly-2024-07-16
RUST_VERSION: 1.81.0
NIGHTLY_RUST_VERSION: nightly-2024-09-11

jobs:
get-fuel-core-version:
Expand Down Expand Up @@ -245,6 +245,9 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}
targets: wasm32-unknown-unknown
- uses: Swatinem/rust-cache@v2
- name: Install clang
if: ${{ env.ACT }}
run: dpkg -l clang || apt-get update && apt-get install -y clang
- name: Install Forc
run: cargo install --locked --debug --path ./forc
- name: Initialize test project
Expand Down Expand Up @@ -423,32 +426,40 @@ jobs:
contents: write
steps:
- uses: actions/checkout@v3
- name: Install toolchain
- name: Install Rust toolchain
if: ${{ !env.ACT }}
Copy link
Member

Choose a reason for hiding this comment

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

nit: I'd prefer to do the act-related stuff in a separate PR since it's not related to updating the dependencies

uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_VERSION }}
- uses: Swatinem/rust-cache@v2
- name: Enable Rust caching
if: ${{ !env.ACT }}
uses: Swatinem/rust-cache@v2
- name: Install Forc
if: ${{ !env.ACT }}
run: cargo install --locked --debug --path ./forc
- name: Run benchmarks
if: ${{ !env.ACT }}
run: ./benchmark.sh
- name: Checkout benchmark data
if: github.event_name != 'push'
if: ${{ !env.ACT && github.event_name != 'push' }}
uses: actions/checkout@v3
with:
repository: FuelLabs/sway-performance-data
path: performance-data
token: ${{ secrets.CI_ACCOUNT_PAT }}
- name: Checkout benchmark data
if: github.event_name == 'push'
if: ${{ !env.ACT && github.event_name == 'push' }}
uses: actions/checkout@v3
with:
repository: FuelLabs/sway-performance-data
path: performance-data
token: ${{ secrets.CI_ACCOUNT_PAT }}
- name: Prepare benchmarks data for commit
if: github.event_name == 'push'
if: ${{ !env.ACT && github.event_name == 'push' }}
run: ./benchmark.sh --prepare-for-commit
- uses: EndBug/add-and-commit@v9
- name: Commit benchmark data
if: ${{ !env.ACT }}
uses: EndBug/add-and-commit@v9
with:
cwd: "./performance-data"
message: "Updated benchmark data"
Expand Down Expand Up @@ -542,7 +553,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup Rust and cargo-nextest
uses: moonrepo/setup-rust@v0
uses: moonrepo/setup-rust@v1
with:
channel: stable
cache-target: release
Expand All @@ -560,7 +571,7 @@ jobs:
with:
toolchain: ${{ env.RUST_VERSION }}
- uses: Swatinem/rust-cache@v2
- name: Run forc tests separately
- name: Run forc tests separately
env:
RUST_BACKTRACE: full
run: cargo test --locked --release -p forc -- --nocapture
Expand Down Expand Up @@ -588,7 +599,8 @@ jobs:
- name: Install cargo-udeps
run: cargo install --locked cargo-udeps
- name: Check Unused Deps
run: cargo udeps --locked --all-targets
# cargo udeps will fail if the cache is empty on first go, so try one more time
run: cargo udeps --locked --all-targets || cargo udeps --locked --all-targets

notify-slack-on-failure:
needs:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,8 @@ forc-plugins/forc-debug/tests/**/Forc.lock
examples/**/*/Forc.lock
docs/reference/src/code/examples/**/*/Forc.lock

# `act` for local GitHub Actions
bin/act

# Insta files
*.snap.new
Loading
Loading