Skip to content

Commit

Permalink
Merge branch 'master' into osrfbuild_credential_binding
Browse files Browse the repository at this point in the history
  • Loading branch information
j-rivero committed Dec 7, 2023
2 parents 3df462d + d468bd2 commit f739238
Show file tree
Hide file tree
Showing 191 changed files with 7,946 additions and 3,980 deletions.
15 changes: 7 additions & 8 deletions .github/ISSUE_TEMPLATE/bump_libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ title: "Bump in [COLLECTION]: [LIBRARIES]"
Use this template to keep track of everything that needs to be done to
bump the major version of a library within a collection.
For example, Ignition-X is currently under development, and it's using
For example, Gazebo-X is currently under development, and it's using
ign-math42. This checklist includes all that's needed to use ign-math43
instead.
This script can be used to do most of the work:
https://github.com/ignition-tooling/release-tools/blob/master/release-repo-scripts/bump_dependency.bash
https://github.com/gazebo-tooling/release-tools/blob/master/release-repo-scripts/bump_dependency.bash
When opening PRs, add a link back to this issue for easier tracking.
Expand All @@ -26,11 +26,10 @@ Libraries being bumped:
<!-- Be sure to include all downstream libraries that will need to be bumped too -->

* <LIBRARY NAME AND VERSION>: <!-- Explain why bump is needed -->
- [ ] Source code of all downstream libraries ([example](https://github.com/ignitionrobotics/ign-transport/pull/149))
- [ ] Release repositories of all downstream libraries ([example](https://github.com/ignition-release/ign-fuel-tools7-release/pull/1))
- [ ] Use `main` branch on `gazebodistro` ([example](https://github.com/ignition-tooling/gazebodistro/pull/42))
- [ ] Build nightlies from the `main` branch ([example](https://github.com/ignition-tooling/release-tools/pull/437))
- [ ] Update gzdev to use nightlies on CI ([example](https://github.com/ignition-tooling/gzdev/pull/31))
- [ ] Source code of all downstream libraries ([example](https://github.com/gazebosim/gz-transport/pull/149))
- [ ] Release repositories of all downstream libraries ([example](https://github.com/gazebo-release/gz-fuel-tools7-release/pull/1))
- [ ] Use `main` branch on `gazebodistro` ([example](https://github.com/gazebo-tooling/gazebodistro/pull/42))
- [ ] Build nightlies from the `main` branch ([example](https://github.com/gazebo-tooling/release-tools/pull/437))
- [ ] homebrew-simulation: create formula and update dependencies ([example](https://github.com/osrf/homebrew-simulation/pull/14230))
- [ ] docs (the collection’s page) ([example](https://github.com/ignitionrobotics/docs/pull/175))
- [ ] docs (the collection’s page) ([example](https://github.com/gazebosim/docs/pull/175))
* <!-- Add more libraries here and copy the checklist for each of them -->
36 changes: 28 additions & 8 deletions .github/ISSUE_TEMPLATE/eol_collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,33 @@ When opening PRs, add a link back to this issue for easier tracking.
-->

- [ ] Check library versions that can be EOL’d on the [versions table](https://github.com/ignitionrobotics/docs/blob/master/tools/versions.md)
- [ ] Write a post to https://community.gazebosim.org/ announcing the community it has last X weeks for finishing their PRs.
* <!-- LINK POST HERE -->
- [ ] Check library versions that can be EOL’d on the [versions table](https://github.com/gazebosim/docs/blob/master/tools/versions.md)
* <!-- LIST LIBRARIES HERE -->
- [ ] Make releases with outstanding changes in each library about to be EOl'ed
- [ ] Archive release repos for all libraries after the last release has been made
- [ ] Update docs ([example](https://github.com/ignitionrobotics/docs/pull/124))
- [ ] Update release-tools ([example](https://github.com/ignition-tooling/release-tools/pull/369))
- [ ] Deprecate homebrew bottles ([example](https://github.com/osrf/homebrew-simulation/pull/1242))
- [ ] Remove from buildfarmer ([dashboard](https://github.com/osrf/buildfarmer/pull/140) / [report](https://github.com/osrf/buildfarmer/pull/146))
- [ ] Remove from `pr-collection-labeler` ([example](https://github.com/ignition-tooling/pr-collection-labeler/pull/13))
- [ ] Make releases with outstanding changes in each library about to be EOL'ed
* <!-- LIST PRs HERE -->
- [ ] Archive release repos in [gazebo-release](https://github.com/gazebo-release) for all libraries after the last release has been made
- [ ] Update `release-tools` after all releases have been made ([example](https://github.com/gazebo-tooling/release-tools/pull/369))
* <!-- LINK PR HERE -->
- [ ] Deprecate homebrew bottles if they aren't deprecated yet (don't disable them) ([example](https://github.com/osrf/homebrew-simulation/pull/1785))
* <!-- LINK PR HERE -->
- [ ] Remove badges from `homebrew-simulation` README ([example](https://github.com/osrf/homebrew-simulation/pull/1772))
* <!-- LINK PR HERE -->
- [ ] Remove from buildfarmer ([example](https://github.com/osrf/homebrew-simulation/pull/1785))
* <!-- LINK PR HERE -->
- [ ] Remove from `pr-collection-labeler` ([example](https://github.com/gazebo-tooling/pr-collection-labeler/pull/13))
* <!-- LINK PR HERE -->
- [ ] Remove from `ros_ign` ([example](https://github.com/gazebosim/ros_ign/pull/199))
* <!-- LINK PR HERE -->
- [ ] Sync latest binaries to http://packages.ros.org ([example](https://github.com/ros-infrastructure/reprepro-updater/pull/145))
* <!-- LINK PR HERE -->
- [ ] Remove from `gzdev`'s `ign_docker_env` ([example](https://github.com/gazebo-tooling/gzdev/pull/56))
* <!-- LINK PR HERE -->
- [ ] Close "<collection> support" ticket after final releases ([example](https://github.com/gazebo-tooling/release-tools/issues/297#issuecomment-1002232980))
* <!-- LINK COMMENT HERE -->
- [ ] Update docs after EOL is complete ([example](https://github.com/gazebosim/docs/pull/124))
* <!-- LINK PR HERE -->
- [ ] Announce EOL on https://community.gazebosim.org/ ([example](https://community.gazebosim.org/t/ignition-blueprint-officially-end-of-life/764))
* <!-- LINK POST HERE -->

11 changes: 5 additions & 6 deletions .github/ISSUE_TEMPLATE/new_collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ When opening PRs, add a link back to this issue for easier tracking.
-->

- [ ] Create `gazebodistro` file for new collection ([example](https://github.com/ignition-tooling/gazebodistro/pull/11))
- [ ] Create `ign-<collection>` and `ign-<collection>-release` repositories ([example source](https://github.com/ignitionrobotics/ign-edifice), [example release](https://github.com/ignition-release/ign-edifice-release))
- [ ] Create `gazebodistro` file for new collection ([example](https://github.com/gazebo-tooling/gazebodistro/pull/11))
- [ ] Create `ign-<collection>` and `ign-<collection>-release` repositories ([example source](https://github.com/gazebosim/gz-edifice), [example release](https://github.com/gazebo-release/ign-edifice-release))
- [ ] Create homebrew-simulation formula for new collection ([example](https://github.com/osrf/homebrew-simulation/pull/1173))
- [ ] Create collection view on release-tools and build nightlies ([example](https://github.com/ignition-tooling/release-tools/pull/422/files))
- [ ] Create collection view on release-tools and build nightlies ([example](https://github.com/gazebo-tooling/release-tools/pull/422/files))
- [ ] Add collection to buildfarmer dashboard ([example](https://github.com/osrf/buildfarmer/pull/183)) / scripts ([example](https://github.com/osrf/buildfarmer/pull/184))
- [ ] Add docs for new collection ([example](https://github.com/ignitionrobotics/docs/pull/95))
- [ ] Add docs for new collection ([example](https://github.com/gazebosim/docs/pull/95))
- [ ] Add new collection label:
- [ ] Add to pr-collection-labeler ([example](https://github.com/ignition-tooling/pr-collection-labeler/pull/11))
- [ ] Add to pr-collection-labeler ([example](https://github.com/gazebo-tooling/pr-collection-labeler/pull/11))
- [ ] Add to all libraries ([handy script](https://github.com/chapulina/github-label-maker/tree/chapulina/ign#ignition))
- [ ] Add new collection tag to Gazebo Answers [here](https://answers.gazebosim.org/settings/FORUM_DATA_RULES/)
96 changes: 75 additions & 21 deletions .github/ISSUE_TEMPLATE/release_collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,75 @@ When opening PRs, add a link back to this issue for easier tracking.

- [ ] Choose name for next release.
- [ ] Merge each library forward from previous versions
- [ ] Label pull requests being considered to enter release with [beta](https://github.com/search?q=org%3Aignitionrobotics+label%3Abeta&state=open)
Pull requests opened against the new collection after then:
- Bug fixes: will be considered for the initial release and labeled `beta`
- New features: will not be considered for the initial release.
- [ ] Pre-release libraries as all `beta` labels are merged.
* <!-- LINK PRS HERE -->
- [ ] Create stable branches off of `main`
- [ ] `New branch` button on branches page ([example](https://github.com/gazebosim/sdformat/branches))
- [ ] Enable CI for stable branches ([example](https://github.com/gazebo-tooling/release-tools/pull/787))
- [ ] Use stable branch jobs in Jenkins view ([example part 1](https://github.com/gazebo-tooling/release-tools/pull/793) and [part 2](https://github.com/gazebo-tooling/release-tools/pull/806))
- [ ] Pull requests previously targeted at `main`:
- Bug fixes:
- Retarget to the new stable branch.
- Label with [beta](https://github.com/search?q=org%3Agazebosim+label%3Abeta&state=open)
- They can be merged until code freeze.
- Backwards-compatible features, either:
- Retarget them to the new stable branch (but they can only be merged after the stable release), or
- Keep targeting `main` and backport after the stable release.
- Breaking features:
- Keep targeting `main` (i.e. they will be delayed until the next major release)
- [ ] Bump all `main` branches to the next major version (`X.0.0~pre1`)
- [ ] Source code ([example](https://github.com/gazebosim/gz-common/pull/193))
* <!-- LINK PRs HERE -->
- [ ] Add files to `gazebodistro` ([example](https://github.com/gazebo-tooling/gazebodistro/pull/12))
* <!-- LINK PR HERE -->
- [ ] Add aliases to `homebrew-simulation` ([example](https://github.com/osrf/homebrew-simulation/commit/1f8602af6f52e06e0542eebfbdbe97f5f6cf950c))
* <!-- LINK PR HERE -->
- [ ] Create new `-release` repositories (use [this script](https://github.com/gazebo-tooling/release-tools/blob/master/release-repo-scripts/new_ignition_release_repos.bash))
- [ ] Enable nightlies for all `main` branches on `gzdev` ([example](https://github.com/gazebo-tooling/gzdev/pull/50))
- [ ] Execute the tick-tock's "tock" for deprecations ([example](https://github.com/gazebosim/gz-sim/pull/875))
* <!-- LINK PRs HERE -->
- [ ] Update Changelog and pre-release libraries as all `beta` labels are merged.
* <!-- LINK PRS HERE -->
- [ ] Make collection pre-release after all libraries are pre-released.
- [ ] Update public documentation to install from pre-releases instead of nightlies.
* <!-- LINK PR HERE -->
- [ ] Update public documentation to install from pre-releases instead of nightlies ([example](https://github.com/gazebosim/docs/pull/196/files#diff-ebeee4adce7cb444f663b59020fb9f43f6f9adf36f63657b8afdeeea7a8530d1)).
* <!-- LINK PR HERE -->
- [ ] Change nightlies to pre-release for release branches on `gzdev` ([example](https://github.com/gazebo-tooling/gzdev/pull/35))
* <!-- LINK PR HERE -->

## Code freeze

- [ ] Start T-Shirt campaign
* <!-- LINK POST HERE -->
- [ ] Hold tutorial party ([example](https://community.gazebosim.org/t/ignition-edifice-tutorial-party-support-open-source-and-get-t-shirts/866))
* <!-- LINK POST HERE -->
- [ ] Update references to the release install instructions
* [ ] Versions doc https://github.com/gazebosim/docs/blob/master/tools/versions.md
* [ ] ROS2 Installation https://github.com/gazebosim/docs/blob/master/ros_installation.md
* [ ] ros_gz README https://github.com/gazebosim/ros_gz/blob/ros2/README.md
- [ ] PRs fixing documentation and critical bugs can be merged and pre-released
- As libraries have all their documentation reviewed:
- [ ] Create stable branches off of main
- [ ] Make stable releases
* <!-- LINK PRs HERE -->

## Release day

- [ ] Make collection stable release after all libraries are released.
- [ ] Update `gazebodistro` ([example](https://github.com/ignition-tooling/gazebodistro/pull/31))
- [ ] Make GitHub releases for all the X.0.0 versions ([example](https://github.com/ignitionrobotics/ign-transport/releases/tag/ignition-transport9_9.0.0))
- [ ] Update docs to say release is stable ([example](https://github.com/ignitionrobotics/docs/pull/171))
* <!-- LINK PR HERE -->
- [ ] Update `gazebodistro` ([example](https://github.com/gazebo-tooling/gazebodistro/pull/31))
* <!-- LINK PR HERE -->
- [ ] Make GitHub releases for all the X.0.0 versions ([example](https://github.com/gazebosim/gz-transport/releases/tag/ignition-transport9_9.0.0))
- [ ] Update docs to say release is stable ([example](https://github.com/gazebosim/docs/pull/171))
* <!-- LINK PR HERE -->
- [ ] Make announcement
* <!-- LINK POST HERE -->

## Post-release

- [ ] Enable Jenkins CI for new stable branches ([example](https://github.com/ignition-tooling/release-tools/pull/299))
- [ ] Remove nightlies for release branches on `gzdev` ([example](https://github.com/ignition-tooling/gzdev/pull/19))
- [ ] Bump all `main` branches to the next major versioni (`X.0.0~pre1`)
- [ ] Source code ([example](https://github.com/ignitionrobotics/ign-common/pull/193))
- [ ] Add files to `gazebodistro` ([example](https://github.com/ignition-tooling/gazebodistro/pull/12))
- [ ] Add aliases to `homebrew-simulation` ([example](https://github.com/osrf/homebrew-simulation/commit/1f8602af6f52e06e0542eebfbdbe97f5f6cf950c))
- [ ] Create new `-release` repositories (use [this script](https://github.com/ignition-tooling/release-tools/blob/master/release-repo-scripts/new_ignition_release_repos.bash))

- [ ] Enable Jenkins CI for new stable branches ([example](https://github.com/gazebo-tooling/release-tools/pull/299))
* <!-- LINK PR HERE -->
- [ ] Remove pre-release for release branches on `gzdev` ([example](https://github.com/gazebo-tooling/gzdev/pull/36))
* <!-- LINK PR HERE -->
- [ ] Update all repositories to default to the new stable branches.

If the collection will be officially paired with a ROS 2 distro:

Expand All @@ -67,6 +101,27 @@ If the collection will be officially paired with a ROS 2 distro:

# Status tracker

Repo | Version | Release Branch | Feature frozen | Synced with previous versions? | Prerelease? | Code Frozen | Stable release? | Open PRs | Pending dep release
-- | -- | -- | -- | -- | -- | -- | -- | -- | --
[gz-tools](https://github.com/gazebosim/gz-tools) | | gz-toolsN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-tools/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-cmake](https://github.com/gazebosim/gz-cmake) | | gz-cmakeN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-cmake/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-math](https://github.com/gazebosim/gz-math) | | gz-mathN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-math/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-plugin](https://github.com/gazebosim/gz-plugin) | | gz-pluginN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-plugin/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-utils](https://github.com/gazebosim/gz-utils) | | gz-utilsN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-utils/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-common](https://github.com/gazebosim/gz-common) | | gz-commonN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-common/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-msgs](https://github.com/gazebosim/gz-msgs) | | gz-msgsN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-msgs/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-rendering](https://github.com/gazebosim/gz-rendering) | | gz-renderingN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-rendering/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[sdformat](https://github.com/gazebosim/sdformat) | | sdfN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/sdformat/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-fuel-tools](https://github.com/gazebosim/gz-fuel-tools) | | gz-fuel-toolsN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-fuel-tools/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-transport](https://github.com/gazebosim/gz-transport) | | gz-transportN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-transport/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-gui](https://github.com/gazebosim/gz-gui) | | gz-guiN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-gui/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-sensors](https://github.com/gazebosim/gz-sensors) | | gz-sensorsN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-sensors/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-physics](https://github.com/gazebosim/gz-physics) | | gz-physicsN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-physics/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-sim](https://github.com/gazebosim/gz-sim) | | gz-simN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-sim/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-launch](https://github.com/gazebosim/gz-launch) | | gz-launchN | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-launch/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[gz-<collection>](https://github.com/gazebosim/gz-<cok>) | | main | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | [PRs](https://github.com/gazebosim/gz-<collection>/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |
[ros_gz](https://github.com/gazebosim/ros_gz) | | <distros> | ✔️ | ✔️ | ✔️ | | | [PRs](https://github.com/gazebosim/ros_gz/pulls/?q=is%3Apr+is%3Aopen+label%3A%22beta%22) |

Track stable release of metapackage `ignition-<collection>`.

* :hourglass: TODO
Expand All @@ -79,10 +134,9 @@ Track stable release of metapackage `ignition-<collection>`.

* **Ubuntu:**
- [ ] :hourglass: Focal/amd64
- [ ] :hourglass: Bionic/amd64
- [ ] :hourglass: Bionic/i386
- [ ] :hourglass: Jammy/amd64
- [ ] :hourglass: Focal/arm64
- [ ] :hourglass: Bionic/arm64
- [ ] :hourglass: Jammy/arm64

* **Debian:**
- [ ] :hourglass: Buster/i386
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/ci-releasepy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Releasing tests

on:
push:
paths:
- release.py

jobs:
dsl_ci:
runs-on: ubuntu-latest
name: release.py checks
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Run release.py script tests
run: ./check_releasepy.bash
Loading

0 comments on commit f739238

Please sign in to comment.