Skip to content

Commit e91952b

Browse files
Carlosespicurmergify[bot]
authored andcommitted
Fix nightly and add PR template (#36)
* Fix python version in Humble nightly Signed-off-by: Carlosespicur <carlosespicur@proton.me> * Add PR template Signed-off-by: Carlosespicur <carlosespicur@proton.me> --------- Signed-off-by: Carlosespicur <carlosespicur@proton.me> (cherry picked from commit 5da3e80) # Conflicts: # .github/workflows/reusable-ci.yml
1 parent 5d0d76a commit e91952b

File tree

4 files changed

+58
-0
lines changed

4 files changed

+58
-0
lines changed

.github/pull_request_template.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!-- Provide a general summary of your changes in the Title above -->
2+
<!-- It must be meaningful and coherent with the changes -->
3+
4+
<!--
5+
If this PR is still a Work in Progress [WIP], please open it as DRAFT.
6+
-->
7+
8+
## Description
9+
10+
<!--
11+
Describe changes in detail.
12+
This includes depicting the context, use case or current behavior and describe the proposed changes.
13+
If several features/bug fixes are included with these changes, please consider opening separated pull requests.
14+
-->
15+
16+
<!--
17+
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
18+
Please uncomment following line, adjusting the corresponding target branches for the backport.
19+
-->
20+
<!-- @Mergifyio backport kilted rolling jazzy humble -->
21+
22+
<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
23+
<!-- Fixes #(issue) -->
24+
25+
<!-- In case the changes are built over a previous pull request, please uncomment next line. -->
26+
<!-- This PR depends on #(PR) and must be merged after that one. -->
27+
28+
## Contributor Checklist
29+
30+
<!--
31+
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
32+
- If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox [ ] with ❌: or __NO__:.
33+
-->
34+
- [ ] Current behavior is correctly described in the README documentation.
35+
- [ ] Applicable backports have been included in the description.
36+
37+
## Reviewer Checklist
38+
39+
- [ ] The title and description correctly express the PR's purpose.
40+
- [ ] Check contributor checklist is correct.
41+
- [ ] Check CI results: changes do not issue any warning.
42+
- [ ] Applicable backports have been requested

.github/workflows/humble-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ jobs:
1212
with:
1313
os: ubuntu-22.04
1414
branch: ${{ github.ref }}
15+
python-version: "3.10"

.github/workflows/nightly-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
with:
1212
branch: humble
1313
os: ubuntu-22.04
14+
python-version: "3.10"
1415
jazzy-ci:
1516
uses: ./.github/workflows/reusable-ci.yml
1617
with:

.github/workflows/reusable-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
description: "The branch to use for the workflow"
1212
required: true
1313
type: string
14+
python-version:
15+
description: "The Python version to use for the workflow"
16+
required: false
17+
type: string
18+
default: "3.12"
1419

1520
jobs:
1621
build:
@@ -35,13 +40,22 @@ jobs:
3540
- name: Setup python
3641
uses: actions/setup-python@v6
3742
with:
43+
<<<<<<< HEAD
3844
python-version: "3.10"
45+
=======
46+
python-version: ${{ inputs.python-version }}
47+
>>>>>>> 5da3e80 (Fix nightly and add PR template (#36))
3948

4049
- name: Install required python packages
4150
uses: ./.github/actions/install_python_packages
4251
with:
52+
<<<<<<< HEAD
4353
packages: "catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions"
4454
python-version: "3.10"
55+
=======
56+
packages: "catkin_pkg lark-parser empy colcon-common-extensions"
57+
python-version: ${{ inputs.python-version }}
58+
>>>>>>> 5da3e80 (Fix nightly and add PR template (#36))
4559
use-sudo: "true"
4660

4761
- name: Install TivaWare SDK

0 commit comments

Comments
 (0)