Skip to content

Commit

Permalink
Merge branch '2.0' into implicit-account-creation-transition
Browse files Browse the repository at this point in the history
  • Loading branch information
thibault-martinez committed Nov 20, 2023
2 parents 78bdad3 + b6d1454 commit 2be5e03
Show file tree
Hide file tree
Showing 290 changed files with 10,300 additions and 11,532 deletions.
10 changes: 5 additions & 5 deletions .github/actions/private-tangle/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ runs:
# remove the last 5 lines and add docker compose with `-d` to run it in the background
sed -i -n -e :a -e '1,5!{P;N;D;};N;ba' run.sh
echo "docker compose -f \$DOCKER_COMPOSE_FILE up -d" >> run.sh
echo "docker compose -f docker-compose.yml up -d" >> run.sh
working-directory: iota-core/tools/docker-network

# Copied from https://github.com/iotaledger/iota-core/blob/926bf11b5fb6dc46b25482770e0ccf1e048b97c9/.github/workflows/unit-test.yml#L16-L19
- uses: actions/setup-go@v4
with:
go-version-file: 'iota-core/go.mod'
go-version-file: "iota-core/go.mod"
cache: false

- name: Setup private tangle
Expand All @@ -37,8 +37,8 @@ runs:

- name: Wait for tangle to start
shell: bash
run: wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for | sh -s -- -t 120 http://localhost:8080/health -- echo "Tangle is up"
run: wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for | sh -s -- -t 120 http://localhost:8050/health -- echo "Tangle is up"
# TODO enable, maybe need another URL
# - name: Wait for faucet to start
# shell: bash
# run: wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for | sh -s -- -t 120 http://localhost:8081/api/info -- echo "Faucet is up"
# shell: bash
# run: wget -qO- https://raw.githubusercontent.com/eficode/wait-for/v2.2.4/wait-for | sh -s -- -t 120 http://localhost:8081/api/info -- echo "Faucet is up"
12 changes: 6 additions & 6 deletions .github/workflows/bindings-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Install wasm-bindgen-cli
uses: jetli/[email protected]
with:
version: "0.2.87"
version: "0.2.88"

- name: Set Up Node.js ${{ matrix.node }} and Yarn Cache
uses: actions/setup-node@v3
Expand All @@ -86,16 +86,16 @@ jobs:
if: ${{ startsWith(matrix.os, 'ubuntu') }}
uses: "./.github/actions/private-tangle/setup"

# - name: Run Yarn Test
# if: ${{ startsWith(matrix.os, 'ubuntu') }}
# working-directory: bindings/wasm/
# run: yarn test
- name: Run Yarn Test
if: ${{ startsWith(matrix.os, 'ubuntu') }}
working-directory: bindings/wasm/
run: yarn test

- name: Run Yarn Test
if: ${{ !startsWith(matrix.os, 'ubuntu') }}
working-directory: bindings/wasm/
# Only run test that doesn't require a node because we can't use the private tangle script on macos and windows
run: yarn test -t 'Wallet methods'
run: yarn test -t 'utils methods'

- name: Tear down private tangle
if: ${{ startsWith(matrix.os, 'ubuntu') }}
Expand Down
Loading

0 comments on commit 2be5e03

Please sign in to comment.