Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update friendbot #621

Merged
merged 3 commits into from
Jul 29, 2024
Merged

Update friendbot #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a1e847
Update friendbot
leighmcculloch Jul 28, 2024
7628cb7
upd v
leighmcculloch Jul 28, 2024
ee0b2cf
Merge branch 'master' into update-friendbot
leighmcculloch Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build-future.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 31fc8f4236388f12fc609228b7a7f5494867a1f9
test_matrix: |
{
"network": ["local"],
Expand All @@ -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: 31fc8f4236388f12fc609228b7a7f5494867a1f9
test_matrix: |
{
"network": ["local"],
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 31fc8f4236388f12fc609228b7a7f5494867a1f9
test_matrix: |
{
"network": ["pubnet", "local"],
Expand All @@ -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: 31fc8f4236388f12fc609228b7a7f5494867a1f9
test_matrix: |
{
"network": ["pubnet", "local"],
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 31fc8f4236388f12fc609228b7a7f5494867a1f9
test_matrix: |
{
"network": ["testnet", "pubnet", "local"],
Expand All @@ -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: 31fc8f4236388f12fc609228b7a7f5494867a1f9
test_matrix: |
{
"network": ["testnet", "pubnet", "local"],
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand All @@ -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 }}
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
9 changes: 6 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading