Skip to content

Commit

Permalink
Merge branch 'master' into jjcnn/move-name-resolution-to-root
Browse files Browse the repository at this point in the history
  • Loading branch information
IGI-111 authored Apr 30, 2024
2 parents 3b099c4 + 850a2c4 commit 8ec8c85
Show file tree
Hide file tree
Showing 1,026 changed files with 14,185 additions and 1,376 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# Syntax highlighting of sway files as rust
*.sw linguist-language=Rust

# Syntax highlighting of ir files as LLVM
*.ir linguist-language=LLVM
25 changes: 23 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,27 @@ jobs:
- name: Run the formatter against all sway projects and fail if any of them panic
run: scripts/formatter/forc-fmt-check-panic.sh

check-sdk-harness-test-suite-compatibility:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Install toml-cli
run: cargo install toml-cli

- name: Read and compare versions
env:
PACKAGE_NAMES: "fuel-core-client" # multiple packages can be specified delimeted with `,`.
run: |
.github/workflows/scripts/check-sdk-harness-version.sh
build-mdbook:
runs-on: buildjet-8vcpu-ubuntu-2204
steps:
Expand Down Expand Up @@ -353,7 +374,7 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}
- uses: Swatinem/rust-cache@v2
- name: Cargo Run E2E Tests (EVM)
run: cargo run --locked --release --bin test -- --target evm --locked
run: cargo run --locked --release --bin test -- --target evm --locked --no-encoding-v1

cargo-run-e2e-test-midenvm:
runs-on: ubuntu-latest
Expand All @@ -365,7 +386,7 @@ jobs:
toolchain: ${{ env.RUST_VERSION }}
- uses: Swatinem/rust-cache@v2
- name: Cargo Run E2E Tests (EVM)
run: cargo run --locked --release --bin test -- --target midenvm --locked
run: cargo run --locked --release --bin test -- --target midenvm --locked --no-encoding-v1

# TODO: Remove this upon merging std tests with the rest of the E2E tests.
cargo-test-lib-std:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/scripts/check-sdk-harness-version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
IFS=',' read -ra PACKAGES <<< "$PACKAGE_NAMES"
mismatch=0
for PACKAGE in "${PACKAGES[@]}"; do
VERSION_FIRST=$(toml get ./Cargo.toml "workspace.dependencies.$PACKAGE.version")
VERSION_SECOND=$(toml get ./test/src/sdk-harness/Cargo.toml "dependencies.$PACKAGE.version")
printf "$PACKAGE Version - First: $VERSION_FIRST, Second: $VERSION_SECOND\n"
if [ "$VERSION_FIRST" != "$VERSION_SECOND" ]; then
printf "Version mismatch for $PACKAGE: First: $VERSION_FIRST, Second: $VERSION_SECOND\n"
mismatch=1
fi
done
if [ $mismatch -ne 0 ]; then
printf "Version mismatch between fuel-core-client used in sdk-harness and rest of sway repo.\nThis will cause problems if two versions are incompatible or it might simply cause invalid/outdated test suite.\nIf you are bumping fuel-core versions used in sway repo, please also use same version in sdk-harness.\n"
exit 1
else
echo "All specified package versions match."
fi
Loading

0 comments on commit 8ec8c85

Please sign in to comment.