diff --git a/.github/workflows/on-pr-publish.yaml b/.github/workflows/on-pr-publish.yaml index d46920a1..83dbccf6 100644 --- a/.github/workflows/on-pr-publish.yaml +++ b/.github/workflows/on-pr-publish.yaml @@ -10,8 +10,7 @@ jobs: runs-on: ubuntu-latest # Map a step output to a job output outputs: - # should_skip: ${{ steps.skip_check.outputs.should_skip }} - should_skip: false # XXX dev + should_skip: ${{ steps.skip_check.outputs.should_skip }} steps: - id: skip_check uses: fkirc/skip-duplicate-actions@v4 diff --git a/scripts/integration-setup.sh b/scripts/integration-setup.sh index 7a67f13a..ad552e35 100755 --- a/scripts/integration-setup.sh +++ b/scripts/integration-setup.sh @@ -16,31 +16,20 @@ laconic_so="${LACONIC_SO:-laconic-so} --verbose --stack fixturenet-eth-loaded" set -x -# # Build and deploy a cluster with only what we need from the stack -# $laconic_so setup-repositories \ -# --exclude cerc-io/ipld-eth-server,cerc-io/tx-spammer \ -# --branches-file ./test/stack-refs.yml - -# $laconic_so build-containers \ -# --exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer - -IMAGE_IPLD_ETH_DB=git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.0.2-alpha -IMAGE_GETH=git.vdb.to/cerc-io/go-ethereum/go-ethereum:v1.11.5-statediff-5.0.5-alpha - -docker pull $IMAGE_IPLD_ETH_DB -docker pull $IMAGE_GETH -docker tag $IMAGE_IPLD_ETH_DB cerc/ipld-eth-db:local -docker tag $IMAGE_GETH cerc/go-ethereum:local +# Build and deploy a cluster with only what we need from the stack +$laconic_so setup-repositories \ + --exclude cerc-io/ipld-eth-server,cerc-io/tx-spammer \ + --branches-file ./test/stack-refs.yml $laconic_so build-containers \ - --exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer,cerc/go-ethereum,cerc/ipld-eth-db + --exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer $laconic_so deploy \ --include fixturenet-eth,ipld-eth-db \ --env-file $CONFIG_DIR/stack.env \ --cluster test up -# set +x +set +x # Get IPv4 endpoint of geth file server bootnode_endpoint=$(docker port test-fixturenet-eth-bootnode-geth-1 9898 | head -1)