Skip to content

Commit

Permalink
Merge branch 'develop' into chore-improve-fungible-module-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
skosito authored Feb 21, 2024
2 parents 3449410 + a464a54 commit 84935c0
Show file tree
Hide file tree
Showing 166 changed files with 4,195 additions and 5,005 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,14 @@ jobs:
command: |
echo "Running Build Tests"
make clean
make test
make test-coverage
- name: Upload coverage reports to Codecov
uses: codecov/[email protected]
with:
file: coverage.out
token: ${{ secrets.CODECOV_TOKEN }}
slug: zeta-chain/node

- name: Build zetacored and zetaclientd
env:
Expand All @@ -77,7 +84,7 @@ jobs:
shell: bash
run: rm -rf *

smoke-test:
e2e-test:
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 25
steps:
Expand Down Expand Up @@ -120,12 +127,12 @@ jobs:
cd contrib/localnet/
docker compose up -d zetacore0 zetacore1 zetaclient0 zetaclient1 eth bitcoin
- name: Run Smoke Test
- name: Run E2E Test
run: |
cd contrib/localnet
docker-compose up orchestrator --exit-code-from orchestrator
if [ $? -ne 0 ]; then
echo "Smoke Test Failed"
echo "E2E Test Failed"
exit 1
fi
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,14 @@ jobs:
command: |
echo "Running Build Tests"
make clean
make test
make test-coverage
- name: Upload coverage reports to Codecov
uses: codecov/[email protected]
with:
file: coverage.out
token: ${{ secrets.CODECOV_TOKEN }}
slug: zeta-chain/node

- name: Build zetacored and zetaclientd
if: ${{ github.event.inputs.skip_checks != 'true' }}
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Purpose: This Dockerfile creates an environment for running ZetaChain
# It contains:
# - zetacored: the ZetaChain node binary
# - zetaclientd: the ZetaChain client binary for observers
# - zetae2e: the ZetaChain end-to-end tests CLI

FROM golang:1.20-alpine3.18

ENV GOPATH /go
Expand Down
40 changes: 0 additions & 40 deletions Dockerfile-release

This file was deleted.

10 changes: 7 additions & 3 deletions Dockerfile-versioned-source → Dockerfile-upgrade
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM golang:1.20-alpine3.18

# Purpose: This Dockerfile creates an environment for performing an upgrade test on ZetaChain
# It contains the ZetaChain and ZetaClient binaries for two different versions of ZetaChain
# One is specified with the old_version argument and the other is the current source code
# The image also contains the cosmovisor binary for running the upgrade test

ENV GOPATH /go
ENV GOOS=linux
ENV CGO_ENABLED=1

ARG old_version

RUN apk --no-cache add git make build-base jq openssh libusb-dev linux-headers bash curl tmux
RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N ""

Expand All @@ -17,6 +20,7 @@ WORKDIR /go/delivery/zeta-node
RUN mkdir -p $GOPATH/bin/old
RUN mkdir -p $GOPATH/bin/new

ARG OLD_VERSION=v12.2.1
ENV NEW_VERSION=v13

# Build new release from the current source
Expand All @@ -33,7 +37,7 @@ RUN cp $GOPATH/bin/zetaclientd $GOPATH/bin/new/
RUN git clone https://github.com/zeta-chain/node.git
RUN cd node && git fetch

RUN cd node && git checkout ${old_version}
RUN cd node && git checkout ${OLD_VERSION}
RUN cd node && make install
RUN cp $GOPATH/bin/zetacored $GOPATH/bin/old/
RUN cp $GOPATH/bin/zetaclientd $GOPATH/bin/old/
Expand Down
66 changes: 0 additions & 66 deletions Dockerfile-versioned

This file was deleted.

Loading

0 comments on commit 84935c0

Please sign in to comment.