Merge branch 'master' into simon-input-output-type-constants

.github/workflows/ci.yml

@@ -8,21 +8,16 @@ on:
   release:
     types: [published]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
 
 jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-
   build-sway-lib-core:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -40,7 +35,6 @@ jobs:
         run: forc build --path sway-lib-core
 
   build-sway-lib-std:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -58,7 +52,6 @@ jobs:
         run: forc build --path sway-lib-std
 
   build-sway-examples:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -109,7 +102,6 @@ jobs:
           args: --bin examples-checker fmt --all-examples
 
   build-mdbook:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -148,7 +140,6 @@ jobs:
           fi
 
   build-forc-test-project:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -177,7 +168,6 @@ jobs:
         run: cd test-proj && forc test
 
   cargo-build-workspace:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -195,7 +185,6 @@ jobs:
           RUSTFLAGS: "-D warnings"
 
   cargo-clippy:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -210,7 +199,6 @@ jobs:
           args: --all-features --all-targets -- -D warnings
 
   cargo-toml-fmt-check:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -226,7 +214,6 @@ jobs:
         run: git ls-files | grep Cargo.toml$ | xargs --verbose -n 1 cargo-toml-lint
 
   cargo-fmt-check:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -240,7 +227,6 @@ jobs:
           args: --all -- --check
 
   cargo-run-e2e-test:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     services:
       fuel-core:
@@ -262,7 +248,6 @@ jobs:
 
   # TODO: Remove this upon merging std tests with the rest of the E2E tests.
   cargo-test-lib-std:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     services:
       fuel-core:
@@ -285,7 +270,6 @@ jobs:
           args: --manifest-path ./test/src/sdk-harness/Cargo.toml -- --test-threads=1 --nocapture
 
   cargo-test-workspace:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -301,7 +285,6 @@ jobs:
           args: --locked
 
   cargo-unused-deps-check:
-    needs: cancel-previous-runs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -549,7 +532,7 @@ jobs:
     name: Install and upload forc binaries to release
     runs-on: ${{ matrix.job.os }}
     if: github.event_name == 'release' && github.event.action == 'published'
-    needs: [cancel-previous-runs, publish]
+    needs: publish
     strategy:
       matrix:
         job:

forc/Cargo.toml

@@ -24,7 +24,7 @@ clap_complete = "3.1"
 forc-pkg = { version = "0.16.2", path = "../forc-pkg" }
 forc-util = { version = "0.16.2", path = "../forc-util" }
 fs_extra = "1.2"
-fuel-asm = "0.5"
+fuel-asm = "0.6"
 fuel-crypto = "0.5"
 fuel-gql-client = { version = "0.9", default-features = false }
 fuel-tx = "0.13"

sway-core/Cargo.toml

@@ -13,7 +13,7 @@ clap = { version = "3.1", features = ["derive"], optional = true }
 derivative = "2.2.0"
 dirs = "3.0"
 either = "1.6"
-fuel-asm = "0.5"
+fuel-asm = "0.6"
 fuel-crypto = "0.5"
 fuel-tx = "0.13"
 fuel-types = "0.5"