diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 127b24092..d40944b46 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: java-version: '11' - name: Download job dsl jar if: steps.dsl_check.outputs.run_job == 'true' - run: curl https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/job-dsl-core/1.77/job-dsl-core-1.77-standalone.jar -o jobdsl.jar + run: curl -sSL https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/job-dsl-core/1.77/job-dsl-core-1.77-standalone.jar -o jobdsl.jar - name: Generate all DSL files if: steps.dsl_check.outputs.run_job == 'true' run: | diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 535d1bd36..cb514fb15 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -84,6 +84,7 @@ gz_prerelease_branches = [] // don't appear in gz_branches (like nightly builders or 0-debbuild // jobs for the special cases of foo0 packages) gz_extra_debbuild = [ 'gui8', + 'fuel-tools9', 'launch7', 'msgs10', 'rendering8', diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index 779179e5a..32eb5abce 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -30,7 +30,7 @@ gz_collections = [ 'msgs' : [ debbuild: 'gz-msgs10' , branch: 'main' ], 'rendering' : [ debbuild: 'gz-rendering8' , branch: 'main' ], 'sdformat' : [ debbuild: 'sdformat13' , branch: 'sdf13' ], - 'fuel-tools': [ debbuild: 'gz-fuel-tools8' , branch: 'gz-fuel-tools8' ], + 'fuel-tools': [ debbuild: 'gz-fuel-tools9' , branch: 'main' ], 'transport' : [ debbuild: 'gz-transport13' , branch: 'main' ], 'gui' : [ debbuild: 'gz-gui8' , branch: 'main' ], 'sensors' : [ debbuild: 'gz-sensors8' , branch: 'main' ], @@ -310,25 +310,25 @@ gz_collection_jobs = 'harmonic' : [ 'ign_cmake-gz-3-win', 'ign_common-gz-5-win', - 'ign_fuel-tools-gz-8-win', + 'ign_fuel-tools-gz-9-win', 'ign_gazebo-ci-win', 'ign_gui-ci-win', 'ign_launch-ci-win', 'ign_math-gz-7-win', - 'ign_msgs-gz-9-win', + 'ign_msgs-gz-10-win', 'ign_physics-gz-6-win', 'ign_plugin-gz-2-win', 'ign_rendering-ci-win', 'ign_sensors-ci-win', 'ign_tools-gz-2-win', - 'ign_transport-gz-12-win', + 'ign_transport-gz-13-win', 'ign_utils-gz-2-win', 'ignition_cmake-ci-gz-cmake3-focal-amd64', 'ignition_cmake-ci-gz-cmake3-homebrew-amd64', 'ignition_common-ci-gz-common5-focal-amd64', 'ignition_common-ci-gz-common5-homebrew-amd64', - 'ignition_fuel-tools-ci-gz-fuel-tools8-focal-amd64', - 'ignition_fuel-tools-ci-gz-fuel-tools8-homebrew-amd64', + 'ignition_fuel-tools-ci-gz-fuel-tools9-focal-amd64', + 'ignition_fuel-tools-ci-gz-fuel-tools9-homebrew-amd64', 'ignition_harmonic-ci-main-homebrew-amd64', 'ignition_gazebo-ci-main-focal-amd64', 'ignition_gazebo-ci-main-homebrew-amd64', @@ -338,8 +338,8 @@ gz_collection_jobs = 'ignition_launch-ci-main-homebrew-amd64', 'ignition_math-ci-gz-math7-focal-amd64', 'ignition_math-ci-gz-math7-homebrew-amd64', - 'ignition_msgs-ci-gz-msgs9-focal-amd64', - 'ignition_msgs-ci-gz-msgs9-homebrew-amd64', + 'ignition_msgs-ci-gz-msgs10-focal-amd64', + 'ignition_msgs-ci-gz-msgs10-homebrew-amd64', 'ignition_physics-ci-gz-physics6-focal-amd64', 'ignition_physics-ci-gz-physics6-homebrew-amd64', 'ignition_plugin-ci-gz-plugin2-focal-amd64', @@ -350,8 +350,8 @@ gz_collection_jobs = 'ignition_sensors-ci-main-homebrew-amd64', 'ignition_tools-ci-gz-tools2-focal-amd64', 'ignition_tools-ci-gz-tools2-homebrew-amd64', - 'ignition_transport-ci-gz-transport12-focal-amd64', - 'ignition_transport-ci-gz-transport12-homebrew-amd64', + 'ignition_transport-ci-gz-transport13-focal-amd64', + 'ignition_transport-ci-gz-transport13-homebrew-amd64', 'ignition_utils-ci-gz-utils2-focal-amd64', 'ignition_utils-ci-gz-utils2-homebrew-amd64', 'sdformat-ci-sdformat13-focal-amd64',