Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.0' into feat/iterable-wallet-data
Browse files Browse the repository at this point in the history
DaughterOfMars authored Nov 16, 2023
2 parents 76dca60 + 383b8a7 commit ae6d9ef
Showing 42 changed files with 500 additions and 1,007 deletions.
8 changes: 4 additions & 4 deletions .github/actions/private-tangle/setup/action.yml
Original file line number Diff line number Diff line change
@@ -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
@@ -40,5 +40,5 @@ runs:
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"
# 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"
Loading

0 comments on commit ae6d9ef

Please sign in to comment.