-
Notifications
You must be signed in to change notification settings - Fork 0
Merge from upstream #2
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.
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
base: master
Are you sure you want to change the base?
Changes from 250 commits
e2295c4
df4b088
bf88b48
9349bb5
973d2d6
818bd2f
e5a96d6
b5aa1ef
b22df56
6d12030
47fce1c
4ba4309
bbdc62b
5b82a8e
b490723
c61fbb2
bafbc5c
91b4aad
7c9821e
5c6e125
dd762be
b8e3fc1
89d39dc
06f2601
9da3e0d
8bfea12
c790e21
bb3c743
268469d
1ff8fb8
9efd021
4def307
7364be9
1b6f231
51eaa37
c9e8cb8
ebfa52b
fa41bb9
eec073e
b659613
733333d
134f159
e47ebd0
a779e87
cdb407b
1ce18f7
f2273b3
bfa4f6c
fbbc597
3ec5cac
b5fc9da
b83d9ef
d0cb16e
183267f
8ba8389
2b027da
14988e8
6d3a967
317afc4
7c8170e
5816629
70eaea7
f9bd0ae
7192cbe
6b3ab3b
1c0ac6d
a40f7e0
b80248f
9bb2503
76d672f
0debdf1
c016de8
3fb8765
a627f0f
130356c
a875dff
b3d052a
815e791
725a35d
73726a3
f98e299
fe8b3e5
6a368b2
d5caea7
79e9376
ae8a863
af7e4b2
062d2cb
7b9113b
0fece33
5444c0d
22b3edb
59d5e73
e2ac36f
b1adc1f
02e4260
3fac3c7
151759b
dc757f5
9fafea2
719e82a
2b057dc
e767c6b
8bb8d55
71a6cf3
b4fb979
9c78e5b
1da5f43
3cfbe1e
f8989bf
c6c9c37
e5e822b
540463c
f8132f9
f78227b
0c6d8f2
8b2f00b
76391fb
96c2137
baba953
b64fcf2
d38cdc0
daf3319
bc35f37
4b461b3
37526ba
c6c2e36
bc0329a
93bc345
36f974e
836c252
48b3c51
2380bfe
d1fb46b
68ca59b
09d4b6e
dddf201
ece4946
4fc6e15
5fcdbb7
2e90ee6
2d50d2f
90a3388
a6e2951
541e542
df78790
6fe7b23
700af84
b3bc59c
ceeb209
b49e308
dcd7f1c
f90b90a
28d8b8b
2f0d5e9
f09cc24
0c4ebca
97747ed
8c06486
c6367af
289344b
7db891e
853f14f
93dcb13
038852a
967ce9a
348fcff
885e22e
07c1c52
27ad192
7094a7c
3be343d
9ce7a7e
7c438b6
16b537c
dd9cb19
d75d406
6ce8e19
f11a324
71e5b9f
e61ced5
78acec1
5389ce2
1c636ce
800b116
c00c752
309f2bd
d865506
fd4b0bd
711a71e
b69d169
608b0b9
ce1de13
e31b840
7113a1c
0972657
9694664
3479155
feae03b
3aa0ddb
cdbd762
2f11b9c
9d1b6e2
76e0460
9c924c7
fa47a14
5639450
ef17cbc
08c3b0c
d7e9e09
09d7bf6
9c1d571
a948a78
c2bec40
550a253
8a337f2
8a6f5e9
64d2b28
ceb4bd0
9389ede
5335298
7c0d016
345649a
6fdfefe
689113a
e66c76e
bc2db20
0405ca1
9d8e677
4284d6c
2cb2d20
13d9da5
e2d1946
8d515d6
5ceb970
62de030
7e9a853
2da5d8a
2819846
576f755
ada68a7
5a98593
bb6f11c
ccf87fa
ac827c6
995e991
5561d13
c23714e
d236954
4be9da6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| --- | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "github-actions" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| # only notify on security updates and not version updates. | ||
| open-pull-requests-limit: 0 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- | ||
| # Add 'noetic' label if any files in noetic/ folder are changed by a PR | ||
| noetic: | ||
| - noetic/* | ||
|
|
||
| # Add 'humble' label if any files in humble/ folder are changed by a PR | ||
| humble: | ||
| - humble/* | ||
|
|
||
| # Add 'jazzy' label if any files in jazzy/ folder are changed by a PR | ||
| jazzy: | ||
| - jazzy/* | ||
|
|
||
| # Add 'kilted' label if any files in kilted/ folder are changed by a PR | ||
| kilted: | ||
| - kilted/* | ||
|
|
||
| # Add 'rolling' label if any files in rolling/ folder are changed by a PR | ||
| rolling: | ||
| - rolling/* | ||
|
|
||
| # Add 'rosdep' label if any files in rosdep/ folder are changed by a PR | ||
| rosdep: | ||
| - rosdep/* | ||
|
|
||
| # Add 'end-of-life' label if any files are in folders for versions that are no longer supported | ||
| end-of-life: | ||
| # ROS 1 | ||
| - groovy/* | ||
| - hydro/* | ||
| - indigo/* | ||
| - jade/* | ||
| - kinetic/* | ||
| - lunar/* | ||
| - melodic/* | ||
| - noetic/* | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bug: Mergify Closes Active PRs: Labeling ConflictThe labeler marks |
||
| # ROS 2 | ||
| - ardent/* | ||
| - bouncy/* | ||
| - crystal/* | ||
| - dashing/* | ||
| - eloquent/* | ||
| - foxy/* | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bug: Inconsistent EOL distribution handling for foxyThe |
||
| - galactic/* | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bug: Inconsistent EOL distribution handling for galacticThe |
||
| - iron/* | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --- | ||
| pull_request_rules: | ||
| - name: Comment on PRs with an end-of-life label | ||
| conditions: | ||
| - label=end-of-life | ||
| actions: | ||
| comment: | ||
| message: > | ||
| This pull request changes files for a ROS distribution | ||
| that is no longer supported (End Of Life) | ||
| and the distribution will not have any future syncs to include this change. | ||
| - name: Close on changes only to EOL folders | ||
| conditions: | ||
| - and: | ||
| - label=end-of-life | ||
| # Active ROS 1 distros | ||
| - label!=melodic | ||
| - label!=noetic | ||
| # Active ROS 2 distros | ||
| - label!=foxy | ||
| - label!=galactic | ||
| - label!=humble | ||
| - label!=rolling | ||
| # Other labels | ||
| - label!=rosdep | ||
| actions: | ||
| close: |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <!-- Thank you for contributing a change to the rosdistro. There are two primary types of submissions. | ||
| Please select the appropriate template from below: ROSDEP_RULE_TEMPLATE or DOC_INDEX_TEMPLATE | ||
|
|
||
| If you're making a new release with bloom please use bloom to create the pull request automatically (except for the naming review request which must be made manually). | ||
| If you've already run the release bloom has a `--pull-request-only` option you can use.--> | ||
|
|
||
| <!-- ROSDEP_RULE_TEMPLATE: Submitter Please review the contributing guidelines: https://github.com/ros/rosdistro/blob/master/CONTRIBUTING.md --> | ||
|
|
||
| Please add the following dependency to the rosdep database. | ||
|
|
||
| ## Package name: | ||
|
|
||
| TODO | ||
|
|
||
| ## Package Upstream Source: | ||
|
|
||
| TODO link to source repository | ||
|
|
||
| ## Purpose of using this: | ||
|
|
||
| TODO Replace. This dependency is being used for this reason. This is why I think it's valuable to be added to the rosdep database. | ||
|
|
||
| Distro packaging links: | ||
|
|
||
| ## Links to Distribution Packages | ||
|
|
||
| <!-- Replace the REQUIRED areas with the URL to the package. For IF AVAILABLE areas, either put in the URL to the package or state 'not available'. | ||
| More info at https://github.com/ros/rosdistro/blob/master/CONTRIBUTING.md#guidelines-for-rosdep-rules --> | ||
|
|
||
| - Debian: https://packages.debian.org/ | ||
| - REQUIRED | ||
| - Ubuntu: https://packages.ubuntu.com/ | ||
| - REQUIRED | ||
| - Fedora: https://packages.fedoraproject.org/ | ||
| - IF AVAILABLE | ||
| - Arch: https://www.archlinux.org/packages/ | ||
| - IF AVAILABLE | ||
| - Gentoo: https://packages.gentoo.org/ | ||
| - IF AVAILABLE | ||
| - macOS: https://formulae.brew.sh/ | ||
| - IF AVAILABLE | ||
| - Alpine: https://pkgs.alpinelinux.org/packages | ||
| - IF AVAILABLE | ||
| - NixOS/nixpkgs: https://search.nixos.org/packages | ||
| - OPTIONAL | ||
| - openSUSE: https://software.opensuse.org/package/ | ||
| - IF AVAILABLE | ||
| - rhel: https://rhel.pkgs.org/ | ||
| - IF AVAILABLE | ||
|
|
||
| <!-- DOC_INDEX_TEMPLATE: add package to rosdistro for documentation indexing --> | ||
|
|
||
| <!--- Templated for adding a package to be indexed in a rosdistro: http://wiki.ros.org/rosdistro/Tutorials/Indexing%20Your%20ROS%20Repository%20for%20Documentation%20Generation --> | ||
|
|
||
| # Please Add This Package to be indexed in the rosdistro. | ||
|
|
||
| ROSDISTRO NAME | ||
|
|
||
| # The source is here: | ||
|
|
||
| http://sourcecode_url | ||
|
|
||
| # Checks | ||
| - [ ] All packages have a declared license in the package.xml | ||
| - [ ] This repository has a LICENSE file | ||
| - [ ] This package is expected to build on the submitted rosdistro |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| --- | ||
| name: Validate rosdistro | ||
| # this is fine since gha runs with yaml 1.2 | ||
| on: # yamllint disable-line rule:truthy | ||
| push: | ||
| branches: ['master'] | ||
| pull_request: | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| checks: | ||
| name: rosdistro / rosdep checks | ||
| runs-on: ubuntu-24.04 | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.8] | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Fetch upstream (to enable diff) | ||
| run: | | ||
| git remote add unittest_upstream_comparison https://github.com/ros/rosdistro.git \ | ||
| || git remote set-url unittest_upstream_comparison https://github.com/ros/rosdistro.git | ||
| git fetch --no-tags --depth=1 unittest_upstream_comparison master | ||
| - name: Install Dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip setuptools wheel | ||
| python -m pip install -r test/requirements.txt | ||
| - name: Run Tests | ||
| run: pytest -s test | ||
| yamllint: | ||
| name: Yaml Linting | ||
| runs-on: ubuntu-24.04 | ||
| strategy: | ||
| matrix: | ||
| python-version: [3.8] | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v5 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| - name: Install Dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip setuptools wheel | ||
| pip install yamllint | ||
| - name: Run yamllint | ||
| run: yamllint . |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- | ||
| name: "Pull Request Labeler" | ||
| # this is fine since gha runs with yaml 1.2 | ||
| on: # yamllint disable-line rule:truthy | ||
| - pull_request_target | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| triage: | ||
| permissions: | ||
| contents: read # for actions/labeler to determine modified files | ||
| pull-requests: write # for actions/labeler to add labels to PRs | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/labeler@v3 | ||
| with: | ||
| repo-token: "${{ secrets.GITHUB_TOKEN }}" | ||
| configuration-path: ".github/labeler-config.yaml" |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --- | ||
| name: Automated review | ||
| on: # yamllint disable-line rule:truthy | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
| - ready_for_review | ||
| - reopened | ||
| - synchronize | ||
|
|
||
| permissions: | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| automated_review: | ||
| name: Generate automated review | ||
| runs-on: ubuntu-latest | ||
| if: ${{ !github.event.pull_request.draft }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - run: git fetch origin ${{ github.event.pull_request.head.sha }} | ||
| - uses: ros-infrastructure/rosdistro-reviewer@main | ||
| with: | ||
| token: ${{ github.token }} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- | ||
| name: 'Label inactive PRs as stale' | ||
|
|
||
| # this is fine since gha runs with yaml 1.2 | ||
| on: # yamllint disable-line rule:truthy | ||
| schedule: | ||
| - cron: '0 11 * * *' # runs at 11am UTC every day => early morning in US | ||
|
|
||
| jobs: | ||
| stale: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/stale@v8 # https://github.com/marketplace/actions/close-stale-issues | ||
| with: | ||
| stale-pr-label: 'stale' | ||
| stale-pr-message: > | ||
| This PR hasn't been activity in 14 days. | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| If you are still are interested in getting it merged | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| please provide an update. | ||
| Otherwise it will likely be closed by a rosdistro maintainer | ||
| following our [contributing policy](https://github.com/ros/rosdistro/blob/master/CONTRIBUTING.md). | ||
| It's been labeled "stale" for visibility to the maintainers. | ||
| If this label isn't appropriate, | ||
| you can ask a maintainer to remove the label and add the 'persistent' label. | ||
| days-before-pr-stale: 14 | ||
| days-before-pr-close: -1 # don't close PRs automatically | ||
| days-before-issue-stale: -1 # don't label issues as stale | ||
| days-before-issue-close: -1 # don't close issues automatically | ||
| exempt-pr-labels: 'persistent' | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| *~ | ||
| .DS_STORE | ||
| *.pyc | ||
| .venv/* |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,21 @@ | ||
| --- | ||
| extends: | ||
| default | ||
|
|
||
| rules: | ||
| # braces: | ||
| # min-spaces-inside: 0 | ||
| # max-spaces-inside: 0 | ||
| # brackets: | ||
| # min-spaces-inside: 0 | ||
| # max-spaces-inside: 0 | ||
| # colons: | ||
| # max-spaces-before: 0 | ||
| # max-spaces-after: 1 | ||
| # commas: | ||
| # max-spaces-before: 0 | ||
| # min-spaces-after: 1 | ||
| # max-spaces-after: 1 | ||
| # comments: | ||
| # level: warning | ||
| # require-starting-space: yes | ||
| # min-spaces-from-content: 2 | ||
| # comments-indentation: | ||
| # level: warning | ||
| # document-end: disable | ||
| # document-start: | ||
| # level: warning | ||
| # present: false | ||
| # empty-lines: | ||
| # max: 2 | ||
| # max-start: 0 | ||
| # max-end: 0 | ||
| # hyphens: | ||
| # max-spaces-after: 1 | ||
| # indentation: | ||
| # spaces: consistent | ||
| # indent-sequences: yes | ||
| # check-multi-line-strings: no | ||
| document-start: | ||
| ignore: | | ||
| releases/*.yaml | ||
| rosdep/*.yaml | ||
| indentation: | ||
| spaces: consistent | ||
| indent-sequences: false | ||
| key-duplicates: enable | ||
| # line-length: | ||
| # max: 999 | ||
| # allow-non-breakable-words: yes | ||
| # new-line-at-end-of-file: enable | ||
| # new-lines: | ||
| # type: unix | ||
| # trailing-spaces: enable | ||
| line-length: | ||
| max: 125 | ||
| allow-non-breakable-words: true | ||
| ignore: | | ||
| rosdep/*.yaml | ||
|
|
||
| ignore: | | ||
| .venv |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Conflicting Noetic Active and End-of-Life Labels
The
noeticdistribution is configured both as an active distribution (lines 3-4) and as an end-of-life distribution (line 36). This creates a conflicting state where PRs modifyingnoetic/*files will receive both thenoeticlabel and theend-of-lifelabel. The mergify configuration in.github/mergify.ymlexpectsnoeticto be active (line 18 excludes it from EOL-only PR closure), but the labeler will still apply theend-of-lifelabel, causing incorrect PR handling.