Skip to content

Commit

Permalink
Merge branch 'main' into feat/eugene/new-serializations
Browse files Browse the repository at this point in the history
  • Loading branch information
0xterminator committed Nov 11, 2024
2 parents f806d66 + eaf9bc8 commit aa7e9f3
Show file tree
Hide file tree
Showing 18 changed files with 2,643 additions and 2,384 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
env:
CARGO_TERM_COLOR: always
CLICOLOR: 1
RUST_NIGHTLY_VERSION: nightly-2024-11-06
RUST_NIGHTLY_VERSION: nightly-2024-10-18
CI: true

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
CARGO_TERM_COLOR: always
CLICOLOR: 1
RUST_VERSION: 1.79.0
RUST_NIGHTLY_VERSION: nightly-2024-11-06
RUST_NIGHTLY_VERSION: nightly-2024-10-18

jobs:
setup:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This guide will show you how to run this project locally if you want to test or
Most projects under the umbrella of data systems are written in Rust, so we prefer using Rust tooling and community standards. Ensure you have the following tools installed:

- [Rust](https://www.rust-lang.org/tools/install) (latest stable version recommended)
- [Rust Nightly](https://rust-lang.github.io/rustup/concepts/channels.html) (version nightly-2024-11-06)
- [Rust Nightly](https://rust-lang.github.io/rustup/concepts/channels.html) (version nightly-2024-10-18)
- [Make](https://www.gnu.org/software/make/)
- [Pre-commit](https://pre-commit.com/#install)
- [NodeJS](https://nodejs.org/en/download/)
Expand Down Expand Up @@ -129,7 +129,7 @@ If you encounter any issues while setting up or contributing to the project, her

1. **Pre-commit hooks failing**: Ensure you've installed all the required dependencies and run `make setup`. If issues persist, try running `pre-commit run --all-files` to see detailed error messages.

2. **Build failures**: Make sure you're using the latest stable Rust version and the correct nightly version. You can update Rust using `rustup update stable` and `rustup update nightly-2024-11-06`.
2. **Build failures**: Make sure you're using the latest stable Rust version and the correct nightly version. You can update Rust using `rustup update stable` and `rustup update nightly-2024-10-18`.

3. **Test failures**: If specific tests are failing, try running them in isolation to see if it's a concurrency issue. Use `RUST_BACKTRACE=1` to get more detailed error information.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

PACKAGE ?= fuel-streams
COMMANDS ?= rustup npm pre-commit docker python3
RUST_NIGHTLY_VERSION ?= nightly-2024-11-06
RUST_NIGHTLY_VERSION ?= nightly-2024-10-18
RUST_VERSION ?= 1.81.0
VERSION ?= $(shell cargo metadata --format-version=1 | jq -r '.packages[] | select(.name == "$(PACKAGE)") | .version')

Expand Down
Loading

0 comments on commit aa7e9f3

Please sign in to comment.