Skip to content

Add a pixi toml url to the build parameter arguments (ported from #839) #841

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
knmcguire wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Add a pixi toml url to the build parameter arguments (ported from #839) #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b8eb50e
Remove ROS_distro from dockerfile since that already exist
knmcguire Jan 18, 2026
eb668bd
add pixi toml url to create jenkin jobs
knmcguire Jan 18, 2026
53183d5
adding default_pixi_toml_url to templates
knmcguire Jan 18, 2026
13e75c9
Add pixi urldefinitions to template
knmcguire Jan 18, 2026
d3dbe5e
add --pixi-toml-url
knmcguire Jan 18, 2026
e06d20a
add pixi-toml-url to ci_job template
knmcguire Jan 18, 2026
1e3743f
change order of variable and add more explanation
knmcguire Jan 18, 2026
52a7eb4
add new pixi url parameter in summary description
knmcguire Jan 18, 2026
ae96dbd
Add pixi toml url to win docker file
knmcguire Jan 18, 2026
12f4e11
remove --pixi-toml-url agrument aand add url as build arg
knmcguire Jan 18, 2026
17d0eb5
change order data
knmcguire Jan 18, 2026
68f838e
remove default pixi toml url
knmcguire Feb 8, 2026
3d20cf7
removed one lingering default pixi toml url
knmcguire Feb 8, 2026
465e87d
shell style syntax for windows docker pixi toml url
knmcguire Feb 9, 2026
db24a7c
use another method to get pixi.toml
knmcguire Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions job_templates/ci_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ use_fastrtps_dynamic: ${build.buildVariableResolver.resolve('CI_USE_FASTRTPS_DYN
ci_branch: ${build.buildVariableResolver.resolve('CI_SCRIPTS_BRANCH')}, <br/>
repos_url: ${build.buildVariableResolver.resolve('CI_ROS2_REPOS_URL')}, <br/>
supplemental_repos_url: ${build.buildVariableResolver.resolve('CI_ROS2_SUPPLEMENTAL_REPOS_URL')}, <br/>
pixi_toml_url: ${build.buildVariableResolver.resolve('CI_PIXI_TOML_URL')}, <br/>
colcon_branch: ${build.buildVariableResolver.resolve('CI_COLCON_BRANCH')}, <br/>
use_whitespace: ${build.buildVariableResolver.resolve('CI_USE_WHITESPACE_IN_PATHS')}, <br/>
isolated: ${build.buildVariableResolver.resolve('CI_ISOLATED')}, <br/>
Expand Down Expand Up @@ -260,6 +261,9 @@ if "!CI_BRANCH_TO_TEST!" NEQ "" (
if "!CI_COLCON_BRANCH!" NEQ "" (
set "CI_ARGS=!CI_ARGS! --colcon-branch !CI_COLCON_BRANCH!"
)
if "!CI_PIXI_TOML_URL!" NEQ "" (
set "BUILD_ARGS=!BUILD_ARGS! --build-arg PIXI_TOML_URL=%CI_PIXI_TOML_URL%"
)
if "!CI_USE_WHITESPACE_IN_PATHS!" == "true" (
set "CI_ARGS=!CI_ARGS! --white-space-in sourcespace buildspace installspace workspace"
)
Expand Down
3 changes: 3 additions & 0 deletions job_templates/packaging_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ if "!CI_BRANCH_TO_TEST!" NEQ "" (
if "!CI_COLCON_BRANCH!" NEQ "" (
set "CI_ARGS=!CI_ARGS! --colcon-branch !CI_COLCON_BRANCH!"
)
if "!CI_PIXI_TOML_URL!" NEQ "" (
set "BUILD_ARGS=!BUILD_ARGS! --build-arg PIXI_TOML_URL=!CI_PIXI_TOML_URL!%"
)
if "!CI_USE_CONNEXTDDS!" == "false" (
set "CI_ARGS=!CI_ARGS! --ignore-rmw rmw_connextdds"
)
Expand Down
8 changes: 8 additions & 0 deletions job_templates/snippet/property_parameter-definition_common.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ Use this instead of the Custom .repos file if you want to add to the default rep
<defaultValue>@supplemental_repos_url</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CI_PIXI_TOML_URL</name>
<description>Custom pixi.toml file URL to use instead of the default pixi.toml file.
For example, copy the content of pixi.toml to use instead of the default in a gist, then pass the raw URL here.
The pixi.toml file defines the Pixi environment configuration for the build.</description>
<defaultValue></defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CI_COLCON_BRANCH</name>
<description>Use a specific branch of the colcon repositories.
Expand Down
7 changes: 5 additions & 2 deletions windows_docker_resources/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ ARG WINDOWS_RELEASE_VERSION=$WINDOWS_RELEASE_ID
# Use --isolation=process if you need to build in a mounted volume
FROM mcr.microsoft.com/windows/server:$WINDOWS_RELEASE_VERSION

# Set ROS distro value and pixi.toml url
ARG ROS_DISTRO=rolling
ARG PIXI_TOML_URL=https://raw.githubusercontent.com/ros2/ros2/refs/heads/${ROS_DISTRO}/pixi.toml

# Enable long paths on folders
RUN powershell -noexit "New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1 -PropertyType DWORD -Force"

Expand Down Expand Up @@ -48,9 +52,8 @@ RUN powershell -noexit "$bindir = Join-Path $Env:USERPROFILE\.pixi 'bin' ; $path
RUN echo "@today_str"

# Install dependencies via pixi
ARG ROS_DISTRO=rolling
WORKDIR C:\pixi_ws
RUN powershell -noexit irm https://raw.githubusercontent.com/ros2/ros2/refs/heads/%ROS_DISTRO%/pixi.toml -OutFile pixi.toml
RUN powershell -Command "Invoke-RestMethod -Uri $env:PIXI_TOML_URL -OutFile pixi.toml"
RUN pixi --color never --no-progress -q install
RUN pixi --color never --no-progress -q list

Expand Down