23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

23 separate rustc for build stage - #28

Open
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage
Open

23 separate rustc for build stage#28
ethanfrey wants to merge 3 commits into
stellar:mainfrom
vrfier:23-separate-rustc-for-build-stage

Conversation

@ethanfrey

@ethanfreyethanfrey commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Closes#23

Adds a separate rust version for building stellar-cli vs compiling contracts.

Tested the following:

 ./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.93.0-slim-trixie --rust-image-digest sha256:760ad1d638d70ebbd0c61e06210e1289cbe45ff6425e3ea6e01241de3e14d08e
./scripts/build_image.py --stellar-cli-version 26.0.0 --rust-version 1.94.0-slim-trixie --rust-image-digest sha256:f7bf1c266d9e48c8d724733fd97ba60464c44b743eb4f46f935577d3242d81d0
$ docker run --rm stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
stellar 26.0.0 (60f7458e7ecffddf2f2d91dc6d0d2db4fab03ecc)
stellar-xdr 26.0.0 (dd7a165a193126fd37a751d867bee1cb8f3b55a6)
xdr curr (cff714a5ebaaaf2dac343b3546c2df73f0b7a36e)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.93.0-slim-trixie --version
rustc 1.93.0 (254b59607 2026-01-19)
$ docker run --rm --entrypoint rustc stellar-cli:26.0.0-rust1.94.0-slim-trixie --version
rustc 1.94.0 (4a4ef493e 2026-03-02)

Note that it makes building multiple rust versions for the same cli version much faster as the builder stage is fully cached now.

CopilotAI review requested due to automatic review settings June 10, 2026 09:55

CopilotAI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a separate Rust base image digest for building stellar-cli images, allowing the CLI build stage to be pinned independently from the contract/tooling Rust pin.

Changes:

  • Add cli_rust_version to builds.json/schema and propagate it through the resolved build matrix.
  • Pass CLI_RUST_IMAGE_DIGEST through the workflow + build script into Docker build args.
  • Switch the Dockerfile builder stage to use CLI_RUST_IMAGE_DIGEST.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 6 comments.

Show a summary per file
FileDescription
tests/unit/test_resolve_matrix.pyUpdates expected matrix row keys to include cli_rust_image_digest.
scripts/resolve_matrix.pyComputes and emits cli_rust_image_digest per matrix row with fallback behavior.
scripts/build_image.pyDerives CLI build Rust digest and forwards it as a Docker build-arg + logs it.
builds.schema.jsonAdds cli_rust_version property to the schema.
builds.jsonAdds cli_rust_version pins to CLI version entries.
DockerfileSwaps builder stage base image digest from RUST_IMAGE_DIGEST to CLI_RUST_IMAGE_DIGEST.
.github/workflows/publish.ymlPasses CLI_RUST_IMAGE_DIGEST from the matrix into the build environment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +29 to +30
cli_rust_pin = entry.get("cli_rust_version")
cli_rust_image_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else None
rows.append(
{
"arch": arch,
"cli_rust_image_digest": cli_rust_image_digest or digest,
Comment threadbuilds.schema.json
Comment on lines +43 to +46
"cli_rust_version": {
"$ref": "#/definitions/rust_pin",
"description": "Fully-qualified rust base pin (<rust_base_key>@<image_digest>) to build this stellar-cli release - not the same as the rustc used to compile contracts"
},
Comment on lines 37 to +41
stellar_ref = builds.stellar_cli_ref(data, args.stellar_cli_version)
parsed = rust_keys.parse(args.rust_version)
entry = builds.find_cli(data, args.stellar_cli_version)
cli_rust_pin = entry.get("cli_rust_version") if entry else None
cli_rust_digest = builds.digest_of(cli_rust_pin) if cli_rust_pin else rust_digest
Comment threadDockerfile Outdated
Comment threadDockerfile

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:0a9a2747dd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment threadbuilds.json Outdated
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unable to build versions to match deployed contracts

2 participants

@ethanfrey