Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 17 additions & 5 deletions .github/workflows/test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,17 @@ on:
required: true
type: string

galexie-repo:
description: "The git repo to use for galexie"
required: false
type: string
default: "stellar/stellar-galexie"

galexie-ref:
description: "git ref of galexie to use"
required: true
type: string

horizon-ref:
description: "git ref of stellar/stellar-horizon to use"
required: true
Expand Down Expand Up @@ -159,7 +170,7 @@ jobs:
SYSTEM_TEST_SHA=$(get_commit_sha "stellar/system-test" "${{ inputs.system-test-git-ref }}")

# Compute CLI image cache key
CLI_CACHE_INPUT="${{ runner.os }}-${{ inputs.stellar-cli-repo }}-$CLI_SHA-${{ inputs.stellar-cli-crate-version }}"
CLI_CACHE_INPUT="${{ runner.os }}-${{ inputs.stellar-cli-repo }}-$CLI_SHA-${{ inputs.stellar-cli-ref }}-${{ inputs.stellar-cli-crate-version }}"
CLI_CACHE_KEY="cli-image-$(echo -n "$CLI_CACHE_INPUT" | sha256sum | cut -d' ' -f1)"
echo "cli-image-cache-key=$CLI_CACHE_KEY" >> $GITHUB_OUTPUT

Expand All @@ -174,7 +185,7 @@ jobs:
images<<DELIMITER
[
{
"tag": "rpc-custom",
"tag": "system-test-custom",
"config": {
"protocol_version_default": ${{ inputs.protocol-version }}
},
Expand All @@ -184,7 +195,8 @@ jobs:
{ "name": "rpc", "repo": "${{ inputs.stellar-rpc-repo }}", "ref": "${{ inputs.stellar-rpc-ref }}" },
{ "name": "horizon", "repo": "stellar/stellar-horizon", "ref": "${{ inputs.horizon-ref }}", "options": { "pkg": "github.com/stellar/stellar-horizon" } },
{ "name": "friendbot", "repo": "stellar/friendbot", "ref": "${{ inputs.friendbot-ref }}", "options": { "pkg": "github.com/stellar/friendbot" } },
{ "name": "lab", "repo": "stellar/laboratory", "ref": "${{ inputs.lab-ref }}" }
{ "name": "lab", "repo": "stellar/laboratory", "ref": "${{ inputs.lab-ref }}" },
{ "name": "galexie", "repo": "${{ inputs.galexie-repo }}", "ref": "${{ inputs.galexie-ref }}" }
],
"additional-tests": []
}
Expand Down Expand Up @@ -317,8 +329,8 @@ jobs:
- name: Start quickstart with rpc
uses: stellar/quickstart@main
with:
artifact: image-quickstart-rpc-custom-amd64.tar
tag: rpc-custom-amd64
artifact: image-quickstart-system-test-custom-amd64.tar
tag: system-test-custom-amd64
enable: core,rpc
- name: Download system-test image artifact
uses: actions/download-artifact@v4
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.stellar-cli
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
ARG DOCKERHUB_RUST_VERSION
ARG STELLAR_CLI_CRATE_VERSION

FROM $DOCKERHUB_RUST_VERSION AS builder

# Declare ARG to make it available in this build stage
ARG STELLAR_CLI_CRATE_VERSION

WORKDIR /soroban-tools
COPY . .

Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,17 @@ SYSTEM_TEST_IMAGE=stellar/system-test:dev
build-stellar-cli:
if [ -z "$(STELLAR_CLI_IMAGE)" ]; then \
DOCKERHUB_RUST_VERSION=rust:$$( [ "$(RUST_TOOLCHAIN_VERSION)" = "stable" ] && echo "latest" || echo "$(RUST_TOOLCHAIN_VERSION)"); \
docker buildx build --progress=plain --load -t "$(STELLAR_CLI_STAGE_IMAGE)" --target builder \
DOCKER_CONTEXT=$$( [ -z "$(STELLAR_CLI_CRATE_VERSION)" ] && echo "$(STELLAR_CLI_GIT_REF)" || echo "." ); \
docker build --progress=plain -t "$(STELLAR_CLI_STAGE_IMAGE)" --target builder \
--build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true \
--build-arg DOCKERHUB_RUST_VERSION="$$DOCKERHUB_RUST_VERSION" \
--build-arg STELLAR_CLI_CRATE_VERSION="$(STELLAR_CLI_CRATE_VERSION)" \
-f- $(STELLAR_CLI_GIT_REF) < $(MAKEFILE_DIR)Dockerfile.stellar-cli; \
-f- $$DOCKER_CONTEXT < $(MAKEFILE_DIR)Dockerfile.stellar-cli; \
fi

build: build-stellar-cli
STELLAR_CLI_IMAGE_REF=$$( [ -z "$(STELLAR_CLI_IMAGE)" ] && echo "$(STELLAR_CLI_STAGE_IMAGE)" || echo "$(STELLAR_CLI_IMAGE)"); \
docker buildx build --progress=plain --load -t "$(SYSTEM_TEST_IMAGE)" -f Dockerfile \
docker build --progress=plain -t "$(SYSTEM_TEST_IMAGE)" -f Dockerfile \
--build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true \
--build-arg STELLAR_CLI_CRATE_VERSION=$(STELLAR_CLI_CRATE_VERSION) \
--build-arg STELLAR_CLI_IMAGE_REF=$$STELLAR_CLI_IMAGE_REF \
Expand Down