Merge pull request #173 from renproject/fix/github-token

Update dockerfile and CI
renproject · Nov 21, 2022 · d2e2ed3 · d2e2ed3
2 parents 3363019 + bc33015
commit d2e2ed3
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 35 deletions.
diff --git 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 }}
diff --git 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
@@ -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
@@ -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

diff --git 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}:[email protected]/".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}:[email protected]/"
+COPY ./solana-ffi $GOPATH/src/github.com/renproject/solana-ffi
diff --git 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