Skip to content

Commit

Permalink
Merge branch 'master' into iche033/ionic_launch8
Browse files Browse the repository at this point in the history
  • Loading branch information
iche033 committed Aug 28, 2024
2 parents 709f153 + 27a0f8a commit 8b21da6
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 26 deletions.
30 changes: 25 additions & 5 deletions jenkins-scripts/dsl/gz-collections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,11 @@ collections:
- name: gz-plugin
major_version: 3
repo:
current_branch: main
current_branch: gz-plugin3
- name: gz-common
major_version: 6
repo:
current_branch: main
current_branch: gz-common6
- name: gz-msgs
major_version: 11
repo:
Expand All @@ -395,11 +395,11 @@ collections:
- name: gz-fuel-tools
major_version: 10
repo:
current_branch: main
current_branch: gz-fuel-tools10
- name: gz-transport
major_version: 14
repo:
current_branch: main
current_branch: gz-transport14
- name: gz-gui
major_version: 9
repo:
Expand All @@ -411,7 +411,7 @@ collections:
- name: gz-physics
major_version: 8
repo:
current_branch: main
current_branch: gz-physics8
- name: gz-sim
major_version: 9
repo:
Expand Down Expand Up @@ -449,6 +449,14 @@ collections:
major_version: 4
repo:
current_branch: main
- name: gz-common
major_version: 6
repo:
current_branch: main
- name: gz-fuel-tools
major_version: 10
repo:
current_branch: main
- name: gz-gui
major_version: 9
repo:
Expand All @@ -465,6 +473,14 @@ collections:
major_version: 11
repo:
current_branch: main
- name: gz-physics
major_version: 8
repo:
current_branch: main
- name: gz-plugin
major_version: 3
repo:
current_branch: main
- name: gz-rendering
major_version: 9
repo:
Expand All @@ -473,6 +489,10 @@ collections:
major_version: 9
repo:
current_branch: main
- name: gz-transport
major_version: 14
repo:
current_branch: main
- name: gz-utils
major_version: 3
repo:
Expand Down
70 changes: 50 additions & 20 deletions jenkins-scripts/dsl/logs/generated_jobs.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
asan_ci __upcoming__ gz_cmake-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_common-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_fuel_tools-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_gui-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_math-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_msgs-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_physics-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_plugin-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_rendering-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_sensors-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_tools-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_transport-ci_asan-main-noble-amd64
asan_ci __upcoming__ gz_utils-ci_asan-main-noble-amd64
asan_ci __upcoming__ sdformat-ci_asan-main-noble-amd64
asan_ci citadel gz_cmake-ci_asan-ign-cmake2-focal-amd64
Expand Down Expand Up @@ -71,24 +76,30 @@ asan_ci harmonic gz_transport-ci_asan-gz-transport13-jammy-amd64
asan_ci harmonic gz_utils-ci_asan-gz-utils2-jammy-amd64
asan_ci harmonic sdformat-ci_asan-sdf14-jammy-amd64
asan_ci ionic gz_cmake-ci_asan-gz-cmake4-noble-amd64
asan_ci ionic gz_common-ci_asan-main-noble-amd64
asan_ci ionic gz_fuel_tools-ci_asan-main-noble-amd64
asan_ci ionic gz_common-ci_asan-gz-common6-noble-amd64
asan_ci ionic gz_fuel_tools-ci_asan-gz-fuel-tools10-noble-amd64
asan_ci ionic gz_gui-ci_asan-gz-gui9-noble-amd64
asan_ci ionic gz_launch-ci_asan-main-noble-amd64
asan_ci ionic gz_math-ci_asan-gz-math8-noble-amd64
asan_ci ionic gz_msgs-ci_asan-gz-msgs11-noble-amd64
asan_ci ionic gz_physics-ci_asan-main-noble-amd64
asan_ci ionic gz_plugin-ci_asan-main-noble-amd64
asan_ci ionic gz_physics-ci_asan-gz-physics8-noble-amd64
asan_ci ionic gz_plugin-ci_asan-gz-plugin3-noble-amd64
asan_ci ionic gz_rendering-ci_asan-gz-rendering9-noble-amd64
asan_ci ionic gz_sensors-ci_asan-gz-sensors9-noble-amd64
asan_ci ionic gz_sim-ci_asan-main-noble-amd64
asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64
asan_ci ionic gz_transport-ci_asan-main-noble-amd64
asan_ci ionic gz_transport-ci_asan-gz-transport14-noble-amd64
asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64
asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64
branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64
branch_ci __upcoming__ gz_cmake-main-win
branch_ci __upcoming__ gz_common-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_common-ci-main-noble-amd64
branch_ci __upcoming__ gz_common-main-win
branch_ci __upcoming__ gz_fuel_tools-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_fuel_tools-ci-main-noble-amd64
branch_ci __upcoming__ gz_fuel_tools-main-win
branch_ci __upcoming__ gz_gui-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_gui-ci-main-noble-amd64
branch_ci __upcoming__ gz_gui-main-win
Expand All @@ -98,6 +109,12 @@ branch_ci __upcoming__ gz_math-main-win
branch_ci __upcoming__ gz_msgs-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_msgs-ci-main-noble-amd64
branch_ci __upcoming__ gz_msgs-main-win
branch_ci __upcoming__ gz_physics-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_physics-ci-main-noble-amd64
branch_ci __upcoming__ gz_physics-main-win
branch_ci __upcoming__ gz_plugin-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_plugin-ci-main-noble-amd64
branch_ci __upcoming__ gz_plugin-main-win
branch_ci __upcoming__ gz_rendering-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_rendering-ci-main-noble-amd64
branch_ci __upcoming__ gz_rendering-main-win
Expand All @@ -107,6 +124,9 @@ branch_ci __upcoming__ gz_sensors-main-win
branch_ci __upcoming__ gz_tools-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_tools-ci-main-noble-amd64
branch_ci __upcoming__ gz_tools-main-win
branch_ci __upcoming__ gz_transport-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_transport-ci-main-noble-amd64
branch_ci __upcoming__ gz_transport-main-win
branch_ci __upcoming__ gz_utils-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_utils-ci-main-noble-amd64
branch_ci __upcoming__ gz_utils-main-win
Expand Down Expand Up @@ -319,12 +339,12 @@ branch_ci harmonic sdformat-sdf14-win
branch_ci ionic gz_cmake-4-win
branch_ci ionic gz_cmake-ci-gz-cmake4-homebrew-amd64
branch_ci ionic gz_cmake-ci-gz-cmake4-noble-amd64
branch_ci ionic gz_common-ci-main-homebrew-amd64
branch_ci ionic gz_common-ci-main-noble-amd64
branch_ci ionic gz_common-main-win
branch_ci ionic gz_fuel_tools-ci-main-homebrew-amd64
branch_ci ionic gz_fuel_tools-ci-main-noble-amd64
branch_ci ionic gz_fuel_tools-main-win
branch_ci ionic gz_common-6-win
branch_ci ionic gz_common-ci-gz-common6-homebrew-amd64
branch_ci ionic gz_common-ci-gz-common6-noble-amd64
branch_ci ionic gz_fuel_tools-10-win
branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64
branch_ci ionic gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64
branch_ci ionic gz_gui-9-win
branch_ci ionic gz_gui-ci-gz-gui9-homebrew-amd64
branch_ci ionic gz_gui-ci-gz-gui9-noble-amd64
Expand All @@ -337,12 +357,12 @@ branch_ci ionic gz_math-ci-gz-math8-noble-amd64
branch_ci ionic gz_msgs-11-win
branch_ci ionic gz_msgs-ci-gz-msgs11-homebrew-amd64
branch_ci ionic gz_msgs-ci-gz-msgs11-noble-amd64
branch_ci ionic gz_physics-ci-main-homebrew-amd64
branch_ci ionic gz_physics-ci-main-noble-amd64
branch_ci ionic gz_physics-main-win
branch_ci ionic gz_plugin-ci-main-homebrew-amd64
branch_ci ionic gz_plugin-ci-main-noble-amd64
branch_ci ionic gz_plugin-main-win
branch_ci ionic gz_physics-8-win
branch_ci ionic gz_physics-ci-gz-physics8-homebrew-amd64
branch_ci ionic gz_physics-ci-gz-physics8-noble-amd64
branch_ci ionic gz_plugin-3-win
branch_ci ionic gz_plugin-ci-gz-plugin3-homebrew-amd64
branch_ci ionic gz_plugin-ci-gz-plugin3-noble-amd64
branch_ci ionic gz_rendering-9-win
branch_ci ionic gz_rendering-ci-gz-rendering9-homebrew-amd64
branch_ci ionic gz_rendering-ci-gz-rendering9-noble-amd64
Expand All @@ -355,9 +375,9 @@ branch_ci ionic gz_sim-main-win
branch_ci ionic gz_tools-2-win
branch_ci ionic gz_tools-ci-gz-tools2-homebrew-amd64
branch_ci ionic gz_tools-ci-gz-tools2-noble-amd64
branch_ci ionic gz_transport-ci-main-homebrew-amd64
branch_ci ionic gz_transport-ci-main-noble-amd64
branch_ci ionic gz_transport-main-win
branch_ci ionic gz_transport-14-win
branch_ci ionic gz_transport-ci-gz-transport14-homebrew-amd64
branch_ci ionic gz_transport-ci-gz-transport14-noble-amd64
branch_ci ionic gz_utils-3-win
branch_ci ionic gz_utils-ci-gz-utils3-homebrew-amd64
branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64
Expand All @@ -366,18 +386,28 @@ branch_ci ionic sdformat-ci-sdf15-noble-amd64
branch_ci ionic sdformat-sdf15-win
install_ci __upcoming__ gz_cmake4-install-pkg-noble-amd64
install_ci __upcoming__ gz_cmake4-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_common6-install-pkg-noble-amd64
install_ci __upcoming__ gz_common6-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_fuel_tools10-install-pkg-noble-amd64
install_ci __upcoming__ gz_fuel_tools10-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_gui9-install-pkg-noble-amd64
install_ci __upcoming__ gz_gui9-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_math8-install-pkg-noble-amd64
install_ci __upcoming__ gz_math8-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_msgs11-install-pkg-noble-amd64
install_ci __upcoming__ gz_msgs11-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_physics8-install-pkg-noble-amd64
install_ci __upcoming__ gz_physics8-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_plugin3-install-pkg-noble-amd64
install_ci __upcoming__ gz_plugin3-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_rendering9-install-pkg-noble-amd64
install_ci __upcoming__ gz_rendering9-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_sensors9-install-pkg-noble-amd64
install_ci __upcoming__ gz_sensors9-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_tools3-install-pkg-noble-amd64
install_ci __upcoming__ gz_tools3-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_transport14-install-pkg-noble-amd64
install_ci __upcoming__ gz_transport14-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_utils3-install-pkg-noble-amd64
install_ci __upcoming__ gz_utils3-install_bottle-homebrew-amd64
install_ci __upcoming__ sdformat15-install-pkg-noble-amd64
Expand Down
3 changes: 2 additions & 1 deletion source-repo-scripts/source_changelog.bash
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
git fetch --tags

PREV_VER=${1:-$(git describe --tags --abbrev=0 | sed 's/.*_//')}
echo "Changes since $PREV_VER"
echo "1. **Baseline:** this includes all changes from $PREV_VER and earlier."
echo ""

ORIGIN_URL=$(git remote get-url origin)
REPO=$(basename ${ORIGIN_URL%.git})
Expand Down

0 comments on commit 8b21da6

Please sign in to comment.