Skip to content

Commit

Permalink
Merge branch 'master' into kayagokalp/deploy-default-proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
kayagokalp committed Jul 3, 2024
2 parents 71888b4 + edff10d commit 86f6a29
Show file tree
Hide file tree
Showing 61 changed files with 879 additions and 319 deletions.
21 changes: 20 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,25 @@ jobs:
mv fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core /usr/local/bin/fuel-core
- name: Run tests
run: cargo test --locked --release -p forc-debug
cargo-test-forc-client:
runs-on: ubuntu-latest
needs: get-fuel-core-version
steps:
- uses: actions/checkout@v3
- name: Install toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_VERSION }}
targets: "x86_64-unknown-linux-gnu, wasm32-unknown-unknown"
- uses: Swatinem/rust-cache@v2
- name: Install fuel-core for tests
run: |
curl -sSLf https://github.com/FuelLabs/fuel-core/releases/download/v${{ needs.get-fuel-core-version.outputs.fuel_core_version }}/fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu.tar.gz -L -o fuel-core.tar.gz
tar -xvf fuel-core.tar.gz
chmod +x fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core
mv fuel-core-${{ needs.get-fuel-core-version.outputs.fuel_core_version }}-x86_64-unknown-linux-gnu/fuel-core /usr/local/bin/fuel-core
- name: Run tests
run: cargo test --locked --release -p forc-client
cargo-test-sway-lsp:
runs-on: ubuntu-latest
steps:
Expand All @@ -538,7 +557,7 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}
- uses: Swatinem/rust-cache@v2
- name: Run tests
run: cargo test --locked --release --workspace --exclude forc-debug --exclude sway-lsp
run: cargo test --locked --release --workspace --exclude forc-debug --exclude sway-lsp --exclude forc-client
cargo-unused-deps-check:
runs-on: ubuntu-latest
steps:
Expand Down
91 changes: 55 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Cargo

<!-- markdown-link-check-disable -->
Cargo can be used to install the Sway toolchain with various [`plugins`](https://fuellabs.github.io/sway/v0.61.0/book/forc/plugins/index.html).
Cargo can be used to install the Sway toolchain with various [`plugins`](https://fuellabs.github.io/sway/v0.61.1/book/forc/plugins/index.html).
<!-- markdown-link-check-enable -->

## Dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ The supported operating systems include Linux and macOS; however, Windows is [`u
`Cargo` may be used instead of [`Fuelup`](fuelup.md); however, the user needs to manage the toolchain themselves.

<!-- markdown-link-check-disable -->
The advantage of using `Cargo` is the installation of [`plugins`](https://fuellabs.github.io/sway/v0.61.0/book/forc/plugins/index.html) that have not been added into [`Fuelup`](fuelup.md).
The advantage of using `Cargo` is the installation of [`plugins`](https://fuellabs.github.io/sway/v0.61.1/book/forc/plugins/index.html) that have not been added into [`Fuelup`](fuelup.md).

The disadvantage occurs when [`Fuelup`](fuelup.md) and `Cargo` are used in tandem because the latest [`plugins`](https://fuellabs.github.io/sway/v0.61.0/book/forc/plugins/index.html) may not be recognized.
The disadvantage occurs when [`Fuelup`](fuelup.md) and `Cargo` are used in tandem because the latest [`plugins`](https://fuellabs.github.io/sway/v0.61.1/book/forc/plugins/index.html) may not be recognized.
<!-- markdown-link-check-enable -->

## Source
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The `Sway toolchain` can be built directly from the [`Sway repository`](https://
## Installation & Updating

<!-- markdown-link-check-disable -->
In the root of the repository `/sway/<here>` build [`forc`](https://fuellabs.github.io/sway/v0.61.0/book/forc/commands/index.html) with the following command:
In the root of the repository `/sway/<here>` build [`forc`](https://fuellabs.github.io/sway/v0.61.1/book/forc/commands/index.html) with the following command:
<!-- markdown-link-check-enable -->

```bash
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/src/index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The Sway Reference

<!-- markdown-link-check-disable -->
This is the technical reference for the Sway programming language. For a prose explanation and introduction to the language, please refer to the [Sway Book](https://fuellabs.github.io/sway/v0.61.0/book/).
This is the technical reference for the Sway programming language. For a prose explanation and introduction to the language, please refer to the [Sway Book](https://fuellabs.github.io/sway/v0.61.1/book/).
<!-- markdown-link-check-enable -->
Loading

0 comments on commit 86f6a29

Please sign in to comment.