Merge branch 'master' into collection-context-in-type-check-context

FuelLabs · Sep 19, 2024 · 6749479 · 6749479
2 parents a621475 + 613f129
commit 6749479
Show file tree

Hide file tree

Showing 35 changed files with 258 additions and 965 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -465,8 +465,12 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Install Forc
         run: cargo install --locked --debug --path ./forc
-      - name: Run Unit Tests
-        run: forc build --path sway-lib-core && forc test --path sway-lib-core && forc build --path sway-lib-std && forc test --path sway-lib-std && forc build --path test/src/in_language_tests & forc test --path test/src/in_language_tests
+      - name: Run Core Unit Tests
+        run: forc build --path sway-lib-core && forc test --path sway-lib-core
+      - name: Run Std Unit Tests
+        run: forc build --path sway-lib-std && forc test --path sway-lib-std
+      - name: Run In Language Unit Tests
+        run: forc build --path test/src/in_language_tests && forc test --path test/src/in_language_tests
 
   forc-pkg-fuels-deps-check:
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/forc-pkg/Cargo.toml b/forc-pkg/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "forc-pkg"
-version = "0.63.5"
+version = "0.63.6"
 description = "Building, locking, fetching and updating Sway projects as Forc packages."
 authors.workspace = true
 edition.workspace = true
@@ -13,8 +13,8 @@ ansi_term = "0.12"
 anyhow = "1"
 byte-unit = "5.1.4"
 cid = "0.11"
-forc-tracing = { version = "0.63.5", path = "../forc-tracing" }
-forc-util = { version = "0.63.5", path = "../forc-util" }
+forc-tracing = { version = "0.63.6", path = "../forc-tracing" }
+forc-util = { version = "0.63.6", path = "../forc-util" }
 fuel-abi-types = { workspace = true }
 futures = "0.3"
 git2 = { version = "0.19", features = [
@@ -31,10 +31,10 @@ serde = { version = "1.0", features = ["derive"] }
 serde_ignored = "0.1.9"
 serde_json = "1.0"
 serde_with = "3.3.0"
-sway-core = { version = "0.63.5", path = "../sway-core" }
-sway-error = { version = "0.63.5", path = "../sway-error" }
-sway-types = { version = "0.63.5", path = "../sway-types" }
-sway-utils = { version = "0.63.5", path = "../sway-utils" }
+sway-core = { version = "0.63.6", path = "../sway-core" }
+sway-error = { version = "0.63.6", path = "../sway-error" }
+sway-types = { version = "0.63.6", path = "../sway-types" }
+sway-utils = { version = "0.63.6", path = "../sway-utils" }
 tar = "0.4.38"
 toml = { version = "0.8", features = ["parse"] }
 tracing = "0.1"

diff --git a/forc-plugins/forc-client/Cargo.toml b/forc-plugins/forc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "forc-client"
-version = "0.63.5"
+version = "0.63.6"
 description = "A `forc` plugin for interacting with a Fuel node."
 authors.workspace = true
 edition.workspace = true
@@ -15,11 +15,11 @@ chrono = { version = "0.4", default-features = false, features = ["std"] }
 clap = { version = "4.5.4", features = ["derive", "env"] }
 devault = "0.1"
 dialoguer = "0.11"
-forc = { version = "0.63.5", path = "../../forc" }
-forc-pkg = { version = "0.63.5", path = "../../forc-pkg" }
-forc-tracing = { version = "0.63.5", path = "../../forc-tracing" }
-forc-tx = { version = "0.63.5", path = "../forc-tx" }
-forc-util = { version = "0.63.5", path = "../../forc-util" }
+forc = { version = "0.63.6", path = "../../forc" }
+forc-pkg = { version = "0.63.6", path = "../../forc-pkg" }
+forc-tracing = { version = "0.63.6", path = "../../forc-tracing" }
+forc-tx = { version = "0.63.6", path = "../forc-tx" }
+forc-util = { version = "0.63.6", path = "../../forc-util" }
 forc-wallet = { workspace = true }
 fuel-abi-types = { workspace = true }
 fuel-core-client = { workspace = true, features = ["subscriptions"] }
@@ -36,9 +36,9 @@ rand = "0.8"
 rpassword = "7.2"
 serde = "1.0"
 serde_json = "1"
-sway-core = { version = "0.63.5", path = "../../sway-core" }
-sway-types = { version = "0.63.5", path = "../../sway-types" }
-sway-utils = { version = "0.63.5", path = "../../sway-utils" }
+sway-core = { version = "0.63.6", path = "../../sway-core" }
+sway-types = { version = "0.63.6", path = "../../sway-types" }
+sway-utils = { version = "0.63.6", path = "../../sway-utils" }
 tokio = { version = "1.8", features = ["macros", "rt-multi-thread", "process"] }
 toml_edit = "0.21.1"
 tracing = "0.1"