Merge branch 'master' into sync_service/keep-data-on-stop

FuelLabs · Nov 29, 2024 · e7e4195 · e7e4195
2 parents 8ffd925 + c78b8ba
commit e7e4195
Show file tree

Hide file tree

Showing 47 changed files with 1,958 additions and 549 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ env:
   AWS_ROLE_ARN: arn:aws:iam::024848458133:role/github_oidc_FuelLabs_fuel-core
   AWS_ECR_ORG: fuellabs
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.79.0
+  RUST_VERSION: 1.81.0
   RUST_VERSION_FMT: nightly-2023-10-29
   RUST_VERSION_COV: nightly-2024-06-05
   RUSTFLAGS: -D warnings

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -7,7 +7,7 @@ on:
     # Run weekly
     - cron: '0 0 * * Sun'
   workflow_dispatch:
-    # Needed so we can run it manually
+  # Needed so we can run it manually
 permissions:
   contents: read
 defaults:
@@ -16,7 +16,7 @@ defaults:
 env:
   # So cargo doesn't complain about unstable features
   RUSTC_BOOTSTRAP: 1
-  RUST_VERSION: 1.79.0
+  RUST_VERSION: 1.81.0
   PR_TITLE: Weekly `cargo update`
   PR_MESSAGE: |
     Automation to keep dependencies in `Cargo.lock` current.