diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml index a606e8bfc65..00ef026e02e 100644 --- a/.github/workflows/beekeeper.yml +++ b/.github/workflows/beekeeper.yml @@ -14,7 +14,7 @@ env: SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain" SETUP_CONTRACT_IMAGE_TAG: "0.9.0-rc3" BEELOCAL_BRANCH: "main" - BEEKEEPER_BRANCH: "master" + BEEKEEPER_BRANCH: "feat/act" BEEKEEPER_METRICS_ENABLED: false REACHABILITY_OVERRIDE_PUBLIC: true BATCHFACTOR_OVERRIDE_PUBLIC: 2 @@ -125,6 +125,9 @@ jobs: - name: Set local cluster run: | timeout ${TIMEOUT} make deploylocal BEEKEEPER_CLUSTER=local-dns + - name: Test act + id: act + run: timeout ${TIMEOUT} bash -c 'until beekeeper check --cluster-name local-dns --checks ci-act; do echo "waiting for act..."; sleep .3; done' - name: Test pingpong id: pingpong run: timeout ${TIMEOUT} bash -c 'until beekeeper check --cluster-name local-dns --checks ci-pingpong; do echo "waiting for pingpong..."; sleep .3; done' diff --git a/Makefile b/Makefile index 9aa79e4f9cd..47ea13908bf 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ BEEKEEPER_INSTALL_DIR ?= $(GOBIN) BEEKEEPER_USE_SUDO ?= false BEEKEEPER_CLUSTER ?= local BEELOCAL_BRANCH ?= main -BEEKEEPER_BRANCH ?= master +BEEKEEPER_BRANCH ?= feat/act REACHABILITY_OVERRIDE_PUBLIC ?= false BATCHFACTOR_OVERRIDE_PUBLIC ?= 5 @@ -43,7 +43,7 @@ beekeeper: ifeq ($(BEEKEEPER_BRANCH), master) curl -sSfL https://raw.githubusercontent.com/ethersphere/beekeeper/master/scripts/install.sh | BEEKEEPER_INSTALL_DIR=$(BEEKEEPER_INSTALL_DIR) USE_SUDO=$(BEEKEEPER_USE_SUDO) bash else - git clone -b $(BEEKEEPER_BRANCH) https://github.com/ethersphere/beekeeper.git && mv beekeeper beekeeper_src && cd beekeeper_src && mkdir -p $(BEEKEEPER_INSTALL_DIR) && make binary + git clone -b $(BEEKEEPER_BRANCH)https://github.com/Solar-Punk-Ltd/beekeeper.git && mv beekeeper beekeeper_src && cd beekeeper_src && mkdir -p $(BEEKEEPER_INSTALL_DIR) && make binary ifeq ($(BEEKEEPER_USE_SUDO), true) sudo mv beekeeper_src/dist/beekeeper $(BEEKEEPER_INSTALL_DIR) else