From bfe660cff698773032a0fd40e5ea165a79979fc1 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Fri, 4 Nov 2022 11:35:33 +1100 Subject: [PATCH 1/4] update dockerfile and CI --- .github/workflows/build.yml | 37 ++++++++++++++++++++++++++++--------- Dockerfile | 16 +--------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e8326a1..7d58b521 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,9 +6,15 @@ on: jobs: build: runs-on: ubuntu-latest + env: + FILECOIN_FFI_COMMIT: 7912389334e347bbb2eac0520c836830875c39de + SOLANA_FFI_COMMIT: 720c0143d8655bfcd412ae73c949474df2c1dcf3 steps: - uses: actions/checkout@v2 - + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: "1.16.6" - name: Set output id: push-info run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} @@ -17,24 +23,37 @@ jobs: uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - + - name: Configure git for private modules + env: + TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + run: git config --global url."https://tok-kkk:${TOKEN}@github.com".insteadOf "https://github.com" + - name: Check out solana-ffi with the reference + uses: actions/checkout@v2 + with: + repository: renproject/solana-ffi + ref: ${{ env.SOLANA_FFI_COMMIT }} + path: solana-ffi + - name: Install dependencies (Solana FFI) + run: | + sudo apt-get install -y libudev-dev + cd solana-ffi + go get -u github.com/xlab/c-for-go@cef5ec7 + make clean + make + go install ./... - name: Build and push id: docker_build uses: docker/build-push-action@v2 with: push: true + context: /home/runner/work/multichain/multichain tags: renbot/multichain:${{ steps.push-info.outputs.tag }}, renbot/multichain:latest - secrets: | - GIT_AUTH_TOKEN=${{ secrets.PERSONAL_ACCESS_TOKEN }} - build-args: | - GITHUB_TOKEN=${{ secrets.PERSONAL_ACCESS_TOKEN }} - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} + run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 053a350a..236103a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,6 @@ RUN apt-get update && \ ENV GO111MODULE=on ENV GOPROXY=https://proxy.golang.org -ARG GITHUB_TOKEN -RUN git config --global url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/" -ENV GOPRIVATE="github.com/renproject/ren-solana,github.com/renproject/solana-ffi" - RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" @@ -39,14 +35,4 @@ RUN git checkout 7912389334e347bbb2eac0520c836830875c39de RUN make RUN go install -WORKDIR $GOPATH -RUN go install github.com/xlab/c-for-go@master -RUN mkdir -p src/github.com/renproject -WORKDIR $GOPATH/src/github.com/renproject -RUN git clone https://github.com/renproject/solana-ffi -WORKDIR $GOPATH/src/github.com/renproject/solana-ffi -RUN git checkout 720c0143d8655bfcd412ae73c949474df2c1dcf3 -RUN make clean && make -RUN go install ./... - -RUN git config --global --remove-section url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/" \ No newline at end of file +COPY ./solana-ffi $GOPATH/src/github.com/renproject/solana-ffi \ No newline at end of file From 89f10d37e541392102e4c718d28364328b12176f Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Fri, 4 Nov 2022 14:01:47 +1100 Subject: [PATCH 2/4] fix dependency setup in test --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72d9d3d8..66472e34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -420,7 +420,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls From fc03d828eb30e8fe5f1d5540c5c959e20a940b27 Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Fri, 4 Nov 2022 14:40:34 +1100 Subject: [PATCH 3/4] fix dependency setup in test --- .github/workflows/test.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66472e34..46f70280 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -169,7 +169,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -295,7 +295,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -545,7 +545,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -670,7 +670,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -797,7 +797,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -921,7 +921,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -1045,7 +1045,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -1169,7 +1169,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls @@ -1293,7 +1293,7 @@ jobs: export PATH=$PATH:$(go env GOPATH)/bin source $HOME/.cargo/env go get -u github.com/onsi/ginkgo/ginkgo - go get -u github.com/onsi/gomega/... + go get github.com/onsi/gomega@v1.13.0 go get -u golang.org/x/lint/golint go get -u github.com/loongy/covermerge go get -u github.com/mattn/goveralls From bc33015244b55670123ab3016fc5aa89007333ae Mon Sep 17 00:00:00 2001 From: tok-kkk Date: Mon, 21 Nov 2022 10:12:07 +1100 Subject: [PATCH 4/4] testing --- infra/zcash/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/infra/zcash/Dockerfile b/infra/zcash/Dockerfile index 212cd727..221549a3 100644 --- a/infra/zcash/Dockerfile +++ b/infra/zcash/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update apt-get update && apt-get install -y --no-install-recommends zcash && \ mkdir -p /root/.zcash-params && zcash-fetch-params + COPY zcash.conf /root/.zcash/zcash.conf COPY run.sh /root/run.sh RUN chmod +x /root/run.sh