cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim
, '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

cli: add buildtree checkout command - #2129

Open
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master
Open

cli: add buildtree checkout command#2129
ownik wants to merge 1 commit into
apache:masterfrom
ownik:master

Conversation

@ownik

@ownikownik commented Jun 1, 2026

Copy link
Copy Markdown

This PR adds a "--use-buildtrees" option to "bst artifacts checkout", similar to the existing option in "bst shell".

The goal is to make it possible to check out build artifacts from the sandbox build tree when it is available.

Would be okay with adding this functionality, or are there reasons not to expose it through "bst artifacts checkout"? Or is there another way to get build artifacts from sandbox now?

@ownik

ownik commented Jun 8, 2026

Copy link
Copy Markdown
Author

@BenjaminSchubert@abderrahim@cs-shadow@gtristan@juergbi I've made changes to verify that buildtree exists in the cache, similar to the shell command. Could you please review, please?

@abderrahim

Copy link
Copy Markdown
Contributor

Looks like this is fixing #1822, please link the issue in your PR. Also please add a test for this behaviour.

I'll try to review it today.

@abderrahim

Copy link
Copy Markdown
Contributor

A few things need to be considered in the design of this feature:

  • Someone recently suggested to implement this as a flag to source checkout rather than artifact checkout. It kinda makes sense that the build tree is related to the source, but it's also stored as part of the artifact. Maybe it makes sense to move it to a separate toplevel command? something like bst buildtree checkout?
  • This is currently checking out the buildroot rather than what is traditionally considered a "build tree". This means it can work with both build elements and non-build-elements, but it also means we get a whole sandbox with the dependencies, the build tree, and even the artifact (if the build succeeded) which is probably not what people asking for the build tree are looking for.
  • if we go with a new toplevel command, we might want to expose options to checkout either the build tree or the build root.

@ownik
ownikforce-pushed the master branch 2 times, most recently from 79fb228 to fa9662aCompareJune 9, 2026 12:35
@ownik

ownik commented Jun 9, 2026

Copy link
Copy Markdown
Author

@abderrahim Thanks for the feedback! I've reworked the implementation into a new bst buildtree checkout command. By default it checks out the buildtree, and a --buildroot option can be used to export the entire buildroot instead.

I've also added an integration test covering the new command and link the issue in PR.

@ownikownik changed the title cli: add --use-buildtrees option for artifacts checkoutcli: add buildtree checkout commandJun 9, 2026
@ownik

Copy link
Copy Markdown
Author

@abderrahim Any chance to review this PR?

@abderrahimabderrahim left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the contributions. See my comments below.

Comment threadsrc/buildstream/_stream.py Outdated
Comment on lines +947 to +951
# self.targets contains a list of the loaded target objects
# if we specify --deps build, Stream._load() will return a list
# of build dependency objects, however, we need to prepare a sandbox
# with the target (which has had its appropriate dependencies loaded)
element: Element = self.targets[0]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this make sense for the build tree? Either we're checking out just the buildtree, and then dependencies don't make sense, or we check out the whole buildroot and it already contains the build dependencies.

Am I missing something?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Sorry for the delayed response, and thanks for pointing this out.

Yes, you're right. I've changed this to element: Element = elements[0], is it ok?

Comment threadsrc/buildstream/_stream.py Outdated
# try to pull them if they are not already cached.
#
self.query_cache(elements)
self._pull_missing_artifacts(elements)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we only need to pull the artifact for the element in question. No need for dependencies here.

as an aside, I wonder if we should try to override the pull-buildtrees configuration in this case: if we're pulling to extract a build tree, we should probably try to pull the buildtree even if we usually don't.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Done 👍


try:
artifact = element._get_artifact()
virdir = artifact.get_buildroot() if buildroot else artifact.get_buildtree()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Another thing we need to be aware of (and also give a suggestion about to the user) is that not all elements have a build tree: only build elements do.

So it's not enough to check for the build root, we also need to check for the build tree. Then depending on the availability and the user request, we can suggest an alternative to the user.

buildtree availablebuildroot availableuser requestedresult
YYbuild treeextract build tree
YYbuild rootextract build root
NYbuild treeerror + suggest extract build root
NYbuild rootextract build root
NNbuild treeerror
NNbuild rooterror

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thanks for pointing this out. I've accounted for all of the cases you described and added tests covering them.

Could you please take another look when you have a chance?

Comment threadtests/integration/buildtree.py Outdated
project = str(datafiles)
element_name = "build-shell/buildtree.bst"
checkout = os.path.join(cli.directory, "checkout")
tar = os.path.join(cli.directory, "source-checkout.tar")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
tar=os.path.join(cli.directory, "source-checkout.tar")
tar=os.path.join(cli.directory, "buildtree.tar")

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed

@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
def test_buildtree_checkout_fail(cli, datafiles):
project = str(datafiles)
element_name = "build-shell/buildtree.bst"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We should also test the buildtree of a script element (using build-shell/script.bst). This is the corner case I mentioned above where we have a build root but not a build tree.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

i've added a test case which uses build-shell/script.bst

Add a new `bst buildtree checkout` command for exporting buildtree stored in artifacts.
By default, the command checks out the buildtree. The
`--buildroot` option can be used to export the entire buildroot
sandbox instead.
Fixedapache#1822
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.

2 participants

@ownik@abderrahim