Use private cometbft fork to internal testing

Author: fridrik01

.github/workflows/pipeline.yml

@@ -81,6 +81,10 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Configure private repo access
+        run: |
+          git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/berachain/cometbft-internal".insteadOf "https://github.com/berachain/cometbft-internal"
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
@@ -138,6 +142,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
+
+      - name: Configure private repo access
+        run: |
+          git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/berachain/cometbft-internal".insteadOf "https://github.com/berachain/cometbft-internal"
+
       - name: Check if Docker Hub credentials exist
         id: check-docker-credentials
         run: |
@@ -179,6 +188,7 @@ jobs:
           make ${{ matrix.args }}
         env:
           GOPATH: /home/runner/go
+          GITHUB_TOKEN: ${{ secrets.PRIVATE_REPO_TOKEN }}
 
   # -------------------------------------------------------------------------- #
   #                       Docker Container Build and Push                      #
@@ -196,6 +206,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Configure private repo access
+        run: |
+          git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/berachain/cometbft-internal".insteadOf "https://github.com/berachain/cometbft-internal"
+
       - name: Echo GitHub Context Variables
         env:
           GITHUB_ACTOR: ${{ github.actor }}
@@ -236,6 +250,8 @@ jobs:
       - name: Build Docker image
         run: |
           make build-docker
+        env:
+          GITHUB_TOKEN: ${{ secrets.PRIVATE_REPO_TOKEN }}
 
       - if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
         name: Authenticate to GitHub Container Registry

.github/workflows/release.yaml

@@ -70,6 +70,11 @@ jobs:
     runs-on: ${{ matrix.configs.runs-on }}
     steps:
       - uses: actions/checkout@v3
+
+      - name: Configure private repo access
+        run: |
+          git config --global url."https://${{ secrets.PRIVATE_REPO_TOKEN }}@github.com/berachain/cometbft-internal".insteadOf "https://github.com/berachain/cometbft-internal"
+
       - uses: actions/setup-go@v3
         with:
           go-version: "1.25.5"

Dockerfile

@@ -40,6 +40,10 @@ RUN apk add --no-cache git
 COPY ./go.mod ./go.sum ./
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/go/pkg/mod \
+    --mount=type=secret,id=github_token \
+    if [ -f /run/secrets/github_token ]; then \
+      git config --global url."https://$(cat /run/secrets/github_token)@github.com/berachain/cometbft-internal".insteadOf "https://github.com/berachain/cometbft-internal"; \
+    fi && \
     go mod download
 
 #######################################################

go.mod

@@ -3,8 +3,8 @@ module github.com/berachain/beacon-kit
 go 1.25.5
 
 replace (
-	github.com/cometbft/cometbft => github.com/berachain/cometbft v1.0.1-0.20251015081901-8394c619874a
-	github.com/cometbft/cometbft/api => github.com/berachain/cometbft/api v1.0.1-0.20251015081901-8394c619874a
+	github.com/cometbft/cometbft => github.com/berachain/cometbft-internal v0.0.0-20251208143618-b1de2632679c
+	github.com/cometbft/cometbft/api => github.com/berachain/cometbft-internal/api v0.0.0-20251208143618-b1de2632679c
 	github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.1
 	github.com/ethereum/go-ethereum => github.com/berachain/bera-geth v1.16.3-0.20251030205931-33cdc637de2d
 	github.com/karalabe/ssz => github.com/berachain/karalabe-ssz v0.3.0-alpha.0

go.sum

@@ -78,10 +78,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/berachain/bera-geth v1.16.3-0.20251030205931-33cdc637de2d h1:ikO+o1WPTO5MHmjmI9m34JjI7pahkScjuOzlJaesJV0=
 github.com/berachain/bera-geth v1.16.3-0.20251030205931-33cdc637de2d/go.mod h1:U8+OCIcIGEScedKpVU89CNwFJWdyDLD/TWolw/Gcj18=
-github.com/berachain/cometbft v1.0.1-0.20251015081901-8394c619874a h1:+SbQdFLflXw5Bpg0uPci2Mv37OyFWggx9nKTEumBuAU=
-github.com/berachain/cometbft v1.0.1-0.20251015081901-8394c619874a/go.mod h1:AB3j5W0TQmQSuwRdzWvIBQPAKquFo7VnckwETlAsuwk=
-github.com/berachain/cometbft/api v1.0.1-0.20251015081901-8394c619874a h1:LZt0HFTZ8Jv2GF2tQiMQWSZD73ciBbWpfLyU9LBlnLc=
-github.com/berachain/cometbft/api v1.0.1-0.20251015081901-8394c619874a/go.mod h1:QaK8NCB4rHDs0MdS+L+QOQsL4UM3YJ9OMCNrH+CGdA0=
+github.com/berachain/cometbft-internal v0.0.0-20251208143618-b1de2632679c h1:8Vqqo3d+trnfY9Mgq2nHYbRNH7Hd/lBdNwtT8jxIo0U=
+github.com/berachain/cometbft-internal v0.0.0-20251208143618-b1de2632679c/go.mod h1:AB3j5W0TQmQSuwRdzWvIBQPAKquFo7VnckwETlAsuwk=
+github.com/berachain/cometbft-internal/api v0.0.0-20251208143618-b1de2632679c h1:YHKk7z6lZ0SgxgPlIVvZ9IuzIuGWk1sZ84zZ3jCetOM=
+github.com/berachain/cometbft-internal/api v0.0.0-20251208143618-b1de2632679c/go.mod h1:QaK8NCB4rHDs0MdS+L+QOQsL4UM3YJ9OMCNrH+CGdA0=
 github.com/berachain/karalabe-ssz v0.3.0-alpha.0 h1:SVMU5PSuMB2fgmFTf1rSBY9rEHpQv24DJcqxSrD7jf8=
 github.com/berachain/karalabe-ssz v0.3.0-alpha.0/go.mod h1:7BZG/jckt43eKw7sl/AF6gTcL0oxgFPme39m54v8rDI=
 github.com/bgentry/speakeasy v0.2.0 h1:tgObeVOf8WAvtuAX6DhJ4xks4CFNwPDZiqzGqIHE51E=

scripts/build/build.mk

@@ -109,6 +109,7 @@ build-docker: ## build a docker image containing `beacond`
 	--build-arg GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
 	--build-arg GOOS=linux \
 	--build-arg GOARCH=$(ARCH) \
+	$(if $(GITHUB_TOKEN),--secret id=github_token$(comma)env=GITHUB_TOKEN) \
 	-f ${DOCKERFILE} \
 	-t $(IMAGE_NAME):$(VERSION) \
 	.