Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

Commit

Permalink
chore: update rust version (#1399)
Browse files Browse the repository at this point in the history
* update rust version

* update ci.yml

* rust RUSTC_VERSION in all places where we install toolchain
  • Loading branch information
lostman authored Oct 7, 2023
1 parent 8f7b76a commit d9e274c
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 17 deletions.
28 changes: 19 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
REGISTRY: ghcr.io
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
SQLX_OFFLINE: true
RUSTC_VERSION: 1.72.1
RUSTC_VERSION: 1.73.0
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
IS_MASTER: ${{ github.head_ref == 'master' || github.ref_name == 'master' }}
IS_DEVELOP: ${{ github.head_ref == 'develop' || github.ref_name == 'develop' }}
Expand Down Expand Up @@ -75,7 +75,9 @@ jobs:
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
- uses: buildjet/cache@v3
with:
path: |
Expand All @@ -97,8 +99,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
components: rustfmt
- name: cargo fmt --all --verbose -- --check
run: cargo fmt --all --verbose -- --check
Expand All @@ -113,8 +116,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
components: clippy, rustfmt
- name: cargo clippy --locked --no-default-features
run: cargo clippy --locked --no-default-features
Expand All @@ -129,8 +133,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
components: clippy, rustfmt
- name: cargo clippy --locked --all-targets --all-features
run: cargo clippy --locked --all-targets --all-features
Expand Down Expand Up @@ -159,7 +164,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
- name: cargo test --locked --all-targets --workspace --exclude fuel-indexer-tests
--exclude plugin-tests --exclude fuel-indexer-benchmarks
run: cargo test --locked --all-targets --workspace --exclude fuel-indexer-tests
Expand Down Expand Up @@ -188,8 +195,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
targets: wasm32-unknown-unknown
- uses: buildjet/cache@v3
with:
Expand Down Expand Up @@ -335,8 +343,9 @@ jobs:
ci/macos-install-packages.sh
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
targets: ${{ matrix.job.target }}
- name: Install cross
uses: baptiste0928/cargo-install@v1
Expand Down Expand Up @@ -521,8 +530,9 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTC_VERSION }}
targets: wasm32-unknown-unknown
- name: Verify tag version
run: >
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ edition = "2021"
homepage = "https://fuel.network/"
license = "Apache-2.0"
repository = "https://github.com/FuelLabs/fuel-indexer"
rust-version = "1.72.1"
rust-version = "1.73.0"
version = "0.21.0"

[workspace.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.fuel-node
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1: Build
FROM lukemathwalker/cargo-chef:latest-rust-1.72.1 AS chef
FROM lukemathwalker/cargo-chef:latest-rust-1.73.0 AS chef

WORKDIR /build/

Expand Down
2 changes: 1 addition & 1 deletion deployment/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Stage 1: Build
FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
FROM --platform=$BUILDPLATFORM rust:1.72.1 AS chef
FROM --platform=$BUILDPLATFORM rust:1.73.0 AS chef

ARG TARGETPLATFORM
RUN cargo install cargo-chef
Expand Down
2 changes: 1 addition & 1 deletion examples/fuel-explorer/fuel-explorer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "fuel_explorer"
version = "0.0.0"
edition = "2021"
publish = false
rust-version = "1.72.1"
rust-version = "1.73.0"

[lib]
crate-type = ['cdylib']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "hello_indexer_native"
version = "0.0.0"
edition = "2021"
publish = false
rust-version = "1.72.1"
rust-version = "1.73.0"

[dependencies]
async-trait = { version = "0.1" }
Expand Down
2 changes: 1 addition & 1 deletion examples/hello-world/hello-indexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "hello_indexer"
version = "0.0.0"
edition = "2021"
publish = false
rust-version = "1.72.1"
rust-version = "1.73.0"

[lib]
crate-type = ['cdylib']
Expand Down
4 changes: 2 additions & 2 deletions plugins/forc-index/src/defaults.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ name = "{indexer_name}"
version = "0.0.0"
edition = "2021"
publish = false
rust-version = "1.72.1"
rust-version = "1.73.0"
[[bin]]
name = "{indexer_name}"
Expand All @@ -48,7 +48,7 @@ name = "{indexer_name}"
version = "0.0.0"
edition = "2021"
publish = false
rust-version = "1.72.1"
rust-version = "1.73.0"
[lib]
crate-type = ['cdylib']
Expand Down

0 comments on commit d9e274c

Please sign in to comment.