Update friendbot

stellar · Jul 28, 2024 · 4a1e847 · 4a1e847
1 parent 6a289ce
commit 4a1e847
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/build-future.yml b/.github/workflows/build-future.yml
@@ -34,8 +34,9 @@ jobs:
       protocol_version_default: 21
       xdr_ref: v21.1.0
       core_ref: v21.2.0
-      go_ref: horizon-v2.31.0
+      horizon_ref: horizon-v2.31.0
       soroban_rpc_ref: v21.2.0
+      friendbot_ref: horizon-v2.31.0
       test_matrix: |
         {
           "network": ["local"],
@@ -58,9 +59,10 @@ jobs:
       xdr_ref: v21.1.0
       core_ref: v21.2.0
       core_build_runner_type: ubuntu-latest-16-cores
-      go_ref: horizon-v2.31.0
+      horizon_ref: horizon-v2.31.0
       soroban_rpc_ref: v21.2.0
       soroban_rpc_build_runner_type: ubuntu-latest-16-cores
+      friendbot_ref: horizon-v2.31.0
       test_matrix: |
         {
           "network": ["local"],

diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
@@ -35,8 +35,9 @@ jobs:
       protocol_version_default: 20
       xdr_ref: v21.1.0
       core_ref: v21.2.0
-      go_ref: horizon-v2.31.0
+      horizon_ref: horizon-v2.31.0
       soroban_rpc_ref: v21.2.0
+      friendbot_ref: horizon-v2.31.0
       test_matrix: |
         {
           "network": ["pubnet", "local"],
@@ -59,9 +60,10 @@ jobs:
       xdr_ref: v21.1.0
       core_ref: v21.2.0
       core_build_runner_type: ubuntu-latest-16-cores
-      go_ref: horizon-v2.31.0
+      horizon_ref: horizon-v2.31.0
       soroban_rpc_ref: v21.2.0
       soroban_rpc_build_runner_type: ubuntu-latest-16-cores
+      friendbot_ref: horizon-v2.31.0
       test_matrix: |
         {
           "network": ["pubnet", "local"],

diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml
@@ -36,8 +36,9 @@ jobs:
       protocol_version_default: 21
       xdr_ref: v21.1.0
       core_ref: v21.2.0
-      go_ref: horizon-v2.31.0
+      horizon_ref: horizon-v2.31.0
       soroban_rpc_ref: v21.2.0
+      friendbot_ref: horizon-v2.31.0
       test_matrix: |
         {
           "network": ["testnet", "pubnet", "local"],
@@ -60,9 +61,10 @@ jobs:
       xdr_ref: v21.1.0
       core_ref: v21.2.0
       core_build_runner_type: ubuntu-latest-16-cores
-      go_ref: horizon-v2.31.0
+      horizon_ref: horizon-v2.31.0
       soroban_rpc_ref: v21.2.0
       soroban_rpc_build_runner_type: ubuntu-latest-16-cores
+      friendbot_ref: horizon-v2.31.0
       test_matrix: |
         {
           "network": ["testnet", "pubnet", "local"],

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,8 +38,8 @@ on:
         description: 'The GitHub Runner instance type to build stellar-core on'
         type: 'string'
         default: 'ubuntu-latest'
-      go_ref:
-        description: 'Git ref for the stellar/go repo (stellar-horizon, stellar-friendbot)'
+      horizon_ref:
+        description: 'Git ref for the stellar/go repo (horizon)'
         type: 'string'
         required: true
       xdr_ref:
@@ -54,6 +54,10 @@ on:
         description: 'The GitHub Runner instance type to build soroban-rpc on'
         type: 'string'
         default: 'ubuntu-latest'
+      friendbot_ref:
+        description: 'Git ref for the stellar/go repo (friendbot)'
+        type: 'string'
+        required: true
       test_matrix:
         description: 'JSON matrix for the test job'
         type: 'string'
@@ -65,7 +69,8 @@ on:
 
 env:
   IMAGE: ${{ format('{0}/{1}:{2}', secrets.DOCKERHUB_TOKEN && 'docker.io' || 'ghcr.io', github.repository, github.event_name == 'pull_request' && format('pr{0}-{1}', github.event.pull_request.number, inputs.tag) || inputs.tag) }}
-  GO_REPO_BRANCH: ${{ inputs.go_ref }}
+  HORIZON_REPO_REF: ${{ inputs.horizon_ref }}
+  FRIENDBOT_REPO_REF: ${{ inputs.friendbot_ref }}
   SOROBAN_RPC_REPO_BRANCH: ${{ inputs.soroban_rpc_ref }}
   CORE_REPO: ${{ inputs.core_repo }}
   CORE_REPO_REF: ${{ inputs.core_ref }}
@@ -122,7 +127,7 @@ jobs:
         docker buildx build --platform linux/${{ inputs.arch }} 
         -f Dockerfile.horizon --target builder 
         -t stellar-horizon:${{ inputs.arch }} -o type=docker,dest=/tmp/image 
-        --build-arg REF="${{ env.GO_REPO_BRANCH }}" .
+        --build-arg REF="${{ env.HORIZON_REPO_REF }}" .
     - name: Upload Stellar-Horizon Image
       uses: actions/upload-artifact@v4
       with:
@@ -146,7 +151,7 @@ jobs:
         -f services/friendbot/docker/Dockerfile -t stellar-friendbot:${{ inputs.arch }} 
         -o type=docker,dest=/tmp/image 
         --build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true 
-        https://github.com/stellar/go.git#${{ env.GO_REPO_BRANCH }}
+        https://github.com/stellar/go.git#${{ env.FRIENDBOT_REPO_REF }}
     - name: Upload Stellar-Friendbot Image
       uses: actions/upload-artifact@v4
       with:

diff --git a/Makefile b/Makefile
@@ -27,23 +27,26 @@ build-latest:
 		XDR_REF=v21.1.0 \
 		CORE_REF=v21.2.0 \
 		HORIZON_REF=horizon-v2.31.0 \
-		SOROBAN_RPC_REF=v21.2.0
+		SOROBAN_RPC_REF=v21.2.0 \
+		FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9
 
 build-testing:
 	$(MAKE) build TAG=testing \
 	    PROTOCOL_VERSION_DEFAULT=21 \
 		XDR_REF=v21.1.0 \
 		CORE_REF=v21.2.0 \
 		HORIZON_REF=horizon-v2.31.0 \
-		SOROBAN_RPC_REF=v21.2.0
+		SOROBAN_RPC_REF=v21.2.0 \
+		FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9
 
 build-future:
 	$(MAKE) build TAG=future \
 		PROTOCOL_VERSION_DEFAULT=21 \
 		XDR_REF=v21.1.0 \
 		CORE_REF=v21.2.0 \
 		HORIZON_REF=horizon-v2.31.0 \
-		SOROBAN_RPC_REF=v21.2.0
+		SOROBAN_RPC_REF=v21.2.0 \
+		FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9
 
 build:
 	$(MAKE) -j 4 build-deps