Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Simplify predicate and script #19

Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/scripts/fmt.sh

This file was deleted.

12 changes: 2 additions & 10 deletions .github/scripts/test.sh
@@ -1,12 +1,4 @@
#!/usr/bin/env bash

PROJECT=$1

if [ $PROJECT = 'contract-message-test' ]; then
cd $PROJECT
forc build --path ../contract-message-predicate
forc build --path ../contract-message-script
forc build --path ../contract-message-test

cargo test
fi
forc build
cargo test
21 changes: 4 additions & 17 deletions .github/workflows/ci.yml
Expand Up @@ -37,16 +37,6 @@ jobs:

build:
runs-on: ubuntu-latest

strategy:
matrix:
project: [
'contract-message-predicate',
'contract-message-receiver',
'contract-message-script',
'contract-message-test'
]

steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down Expand Up @@ -75,18 +65,15 @@ jobs:
run: rustup component add rustfmt

- name: Install Fuel toolchain
uses: FuelLabs/action-fuel-toolchain@v0.5.0
uses: FuelLabs/action-fuel-toolchain@v0.6.0
with:
toolchain: beta-3

- name: Check Sway formatting
run: forc fmt --path ${{ matrix.project }} --check

- name: Build Sway
run: forc build --path ${{ matrix.project }}
run: forc fmt --check

- name: Check Rust formatting
run: sh ${{ env.PATH_TO_SCRIPTS }}/fmt.sh ${{ matrix.project }}
run: cargo fmt --verbose --check

- name: Run tests
run: sh ${{ env.PATH_TO_SCRIPTS }}/test.sh ${{ matrix.project }}
run: sh ${{ env.PATH_TO_SCRIPTS }}/test.sh
pixelcircuits marked this conversation as resolved.
Show resolved Hide resolved