ci: Remove all private repo-related workflow/build config (#258)

Signed-off-by: Thane Thomson <[email protected]>
celestiaorg · Feb 2, 2023 · ca75ae7 · ca75ae7
1 parent d41a46e
commit ca75ae7
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 42 deletions.
diff --git a/.github/workflows/e2e-nightly-34x.yml b/.github/workflows/e2e-nightly-34x.yml
@@ -20,12 +20,6 @@ jobs:
         group: ['00', '01', '02', '03']
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    # TODO (thane): Remove once we make the cometbft-db repository public.
-    env:
-      GOPRIVATE: github.com/cometbft/cometbft-db
-      # We have to supply this as an environment variable in order to pass it
-      # through to the "docker" Makefile target in ./test/e2e
-      GO_MODULES_TOKEN: ${{ secrets.GO_MODULES_TOKEN }}
     steps:
       - uses: actions/setup-go@v3
         with:
@@ -40,9 +34,6 @@ jobs:
         # Run make jobs in parallel, since we can't run steps in parallel.
         run: make -j2 docker generator runner
 
-      # TODO(thane): Remove once we make the cometbft-db repository public
-      - run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/
-
       - name: Generate testnets
         working-directory: test/e2e
         # When changing -g, also change the matrix groups above

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -13,12 +13,6 @@ jobs:
   e2e-test:
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    # TODO(thane): Remove once we make the cometbft-db repository public.
-    env:
-      GOPRIVATE: github.com/cometbft/cometbft-db
-      # We have to supply this as an environment variable in order to pass it
-      # through to the "docker" Makefile target in ./test/e2e
-      GO_MODULES_TOKEN: ${{ secrets.GO_MODULES_TOKEN }}
     steps:
       - uses: actions/setup-go@v3
         with:
@@ -31,9 +25,6 @@ jobs:
             go.mod
             go.sum
 
-      # TODO(thane): Remove once we make the cometbft-db repository public.
-      - run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/
-
       - name: Build
         working-directory: test/e2e
         # Run two make jobs in parallel, since we can't run steps in parallel.

diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
@@ -15,9 +15,6 @@ on:
 jobs:
   govulncheck:
     runs-on: ubuntu-latest
-    # TODO(thane): Remove once we make the cometbft-db repository public.
-    env:
-      GOPRIVATE: github.com/cometbft/cometbft-db
     steps:
       - uses: actions/setup-go@v3
         with:
@@ -30,8 +27,6 @@ jobs:
             go.mod
             go.sum
             Makefile
-      # TODO(thane): Remove once we make the cometbft-db repository public.
-      - run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/
       - name: govulncheck
         run: make vulncheck
         if: "env.GIT_DIFF != ''"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,9 +13,6 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     timeout-minutes: 8
-    # TODO(thane): Remove once we make the cometbft-db repository public.
-    env:
-      GOPRIVATE: github.com/cometbft/cometbft-db
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -27,8 +24,6 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      # TODO(thane): Remove once we make the cometbft-db repository public.
-      - run: git config --global url.https://${{ secrets.GO_MODULES_TOKEN }}@github.com/.insteadOf https://github.com/
       - uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and

diff --git a/.github/workflows/testapp-docker.yml b/.github/workflows/testapp-docker.yml
@@ -59,6 +59,3 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'beep_boop' }}
           tags: ${{ steps.prep.outputs.tags }}
-          # TODO(thane): Remove when we publish cometbft-db repository.
-          build-args: |
-            "GO_MODULES_TOKEN=${{ secrets.GO_MODULES_TOKEN }}"
diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
@@ -5,10 +5,6 @@ RUN apk update && \
     apk --no-cache add make git 
 COPY / /cometbft
 WORKDIR /cometbft
-# TODO(thane): Remove once we publish the cometbft-db repository.
-ENV GOPRIVATE=github.com/cometbft/cometbft-db
-ARG GO_MODULES_TOKEN
-RUN apk --no-cache add git && git config --global "url.https://${GO_MODULES_TOKEN}@github.com/".insteadOf "https://github.com/"
 RUN make build-linux
 
 # stage 2

diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile
@@ -3,20 +3,13 @@
 # instead of spending time compiling them.
 FROM golang:1.18
 
-# TODO(thane): Remove once we publish the cometbft-db repository.
-ENV GOPRIVATE=github.com/cometbft/cometbft-db
-ARG GO_MODULES_TOKEN
-
 RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null
 RUN apt-get -qq install -y libleveldb-dev librocksdb-dev >/dev/null
 
 # Set up build directory /src/cometbft
 ENV COMETBFT_BUILD_OPTIONS badgerdb,boltdb,cleveldb,rocksdb
 WORKDIR /src/cometbft
 
-# TODO(thane): Remove once we publish the cometbft-db repository.
-RUN git config --global url.https://${GO_MODULES_TOKEN}@github.com/.insteadOf https://github.com/
-
 # Fetch dependencies separately (for layer caching)
 COPY go.mod go.sum ./
 RUN go mod download