Skip to content

Commit

Permalink
Merge branch 'develop' into btc-client-enforce-nonce-mark
Browse files Browse the repository at this point in the history
  • Loading branch information
ws4charlie authored Jul 28, 2023
2 parents 462ffbf + ebfc62f commit 6ad146a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ on:
- reopened
- ready_for_review

concurrency:
group: ${{ github.event.pull_request.head.ref }}
cancel-in-progress: true

env:
S3_BUCKET_PATH: "zetachain-deployment-files/builds/zeta-node"
S3_PUBLIC_BUCKET_PATH: "zetachain-external-files"
Expand Down Expand Up @@ -81,6 +85,7 @@ jobs:
GOOS: linux
GOARCH: ${{ env.CPU_ARCH }}
run: |
make clean
make install-testnet
cp "$HOME"/go/bin/* ./
Expand Down Expand Up @@ -169,6 +174,7 @@ jobs:
run: |
apk add --no-cache --update
go mod tidy
make clean
make install-testnet
cp "$HOME"/go/bin/* ./
Expand Down Expand Up @@ -196,11 +202,17 @@ jobs:
path: |
zetacored-alpine-*
zetaclientd-alpine-*
- name: Clean Up Alpine Workspace
if: always()
shell: alpine.sh --root {0}
run: |
set -e # fail on error
rm -rf *
- name: Clean Up Workspace
if: always()
uses: AutoModality/action-clean@v1


smoke-test:
runs-on: ["zeta-runners"]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TEST_DIR?="./..."
TEST_BUILD_FLAGS := -tags TESTNET,pebbledb,ledger
PRIV_BUILD_FLAGS := -tags PRIVNET,pebbledb,ledger

clean: clean-binaries clean-dir
clean: clean-binaries clean-dir clean-test-dir

clean-binaries:
@rm -rf ${GOBIN}/zetacored
Expand Down

0 comments on commit 6ad146a

Please sign in to comment.