Skip to content

Commit 2a6f189

Browse files
authored
Merge branch 'main' into feat/planner-waiting-time-buckets
2 parents bf020cc + 76bac25 commit 2a6f189

6 files changed

Lines changed: 136 additions & 26 deletions

File tree

.copilot-collections.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
copilot:
2-
version: "v0.7.0"
2+
version: "v0.11.0"
33
collections:
44
- charm-python
55
- pfe-charms

.github/pull_request_template.md

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
1-
### Overview
1+
#### What this PR does
22

3-
<!-- A high level overview of the change -->
3+
#### Why we need it
44

5-
### Rationale
6-
7-
<!-- The reason the change is needed -->
8-
9-
### Checklist
5+
#### Checklist
106

117
- [ ] Changes comply with the project's coding standards and guidelines (see CONTRIBUTING.md and STYLE.md)
128
- [ ] `CONTRIBUTING.md` has been updated upon changes to the contribution/development process (e.g. changes to the way tests are run)
139
- [ ] Technical author has been assigned to review the PR in case of documentation changes (usually *.md files)
10+
- [ ] I updated `docs/changelog.md` with user-relevant changes
11+
- [ ] I used AI to assist with preparing this PR
12+
- [ ] I added or updated tests as needed (unit and integration)
13+
- [ ] **If integration test modules are used:** I updated the workflow configuration
14+
(e.g., in `.github/workflows/integration_tests.yaml`, ensure the `modules` list is correct)
15+
- [ ] **If this PR involves a Grafana dashboard:** I added a screenshot of the dashboard
16+
- [ ] **If this PR involves Terraform:** `terraform fmt` passes and `tflint` reports no errors
17+
- [ ] **If this PR involves Rockcraft:** I updated the version
18+
19+
<!--
20+
You can adjust the checklist to match the project.
21+
22+
If you are an AI assistant (e.g., GitHub Copilot, ChatGPT, Claude), follow these instructions when generating or completing PR descriptions:
23+
24+
1. Add a **Test plan** section explaining how the changes were tested, including any manual, unit, integration, or workflow tests.
25+
2. Add a **Review focus** section highlighting tricky parts, important decisions, or areas needing human attention.
26+
3. Identify and document any **potential breaking changes**.
27+
4. Highlight any **new dependencies, APIs, modules, or workflow changes** introduced by this PR.
28+
-->
1429

15-
<!-- Explanation for any unchecked items above -->

CONTRIBUTING.md

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Contribute
2-
3-
## Overview
1+
# Contributing
42

53
This document explains the processes and practices recommended for contributing enhancements to the codebase.
64

5+
## Overview
6+
77
- Generally, before developing enhancements to this code base, you should consider [opening an issue](https://github.com/canonical/github-runner-operator/issues) explaining your use case.
88
- If you would like to chat with us about your use-cases or proposed implementation, you can reach us at [Canonical Charm Development Matrix public channel](https://matrix.to/#/#charmhub-charmdev:ubuntu.com) or [Discourse](https://discourse.charmhub.io/).
99
- All enhancements require review before being merged. Code review typically examines
@@ -15,6 +15,14 @@ This document explains the processes and practices recommended for contributing
1515
When contributing, you must abide by the
1616
[Ubuntu Code of Conduct](https://ubuntu.com/community/ethos/code-of-conduct).
1717

18+
## Changelog
19+
20+
Please ensure that any new feature, fix, or significant change is documented by
21+
adding an entry to the [CHANGELOG.md](docs/changelog.md) file. Use the date of the
22+
contribution as the header for new entries.
23+
24+
To learn more about changelog best practices, visit [Keep a Changelog](https://keepachangelog.com/).
25+
1826
## Submissions
1927

2028
If you want to address an issue or a bug in this project,
@@ -32,31 +40,46 @@ also, reference the issue or bug number when you submit the changes.
3240

3341
Your changes will be reviewed in due time; if approved, they will be eventually merged.
3442

35-
### Describing pull requests
43+
### AI
3644

37-
To be properly considered, reviewed and merged,
38-
your pull request must provide the following details:
45+
You are free to use any tools you want while preparing your contribution, including
46+
AI, provided that you do so lawfully and ethically.
3947

40-
- **Title**: Summarize the change in a short, descriptive title.
48+
Avoid using AI to complete issues tagged with the "good first issues" label. The
49+
purpose of these issues is to provide newcomers with opportunities to contribute
50+
to our projects and gain coding skills. Using AI to complete these tasks
51+
undermines their purpose.
4152

42-
- **Overview**: Describe the problem that your pull request solves.
43-
Mention any new features, bug fixes or refactoring.
53+
We have created instructions and tools that you can provide AI while preparing your contribution: [`copilot-collections`](https://github.com/canonical/copilot-collections)
4454

45-
- **Rationale**: Explain why the change is needed.
55+
While it isn't necessary to use `copilot-collections` while preparing your
56+
contribution, these files contain details about our quality standards and
57+
practices that will help the AI avoid common pitfalls when interacting with
58+
our projects. By using these tools, you can avoid longer review times and nitpicks.
4659

47-
- **Checklist**: Complete the following items:
60+
If you choose to use AI, please disclose this information to us by indicating
61+
AI usage in the PR description (for instance, marking the checklist item about
62+
AI usage). You don't need to go into explicit details about how and where you used AI.
4863

49-
- The PR is tagged with appropriate label (`urgent`, `trivial`, `senior-review-required`, `documentation`).
64+
Avoid submitting contributions that you don't fully understand.
65+
You are responsible for the entire contribution, including the AI-assisted portions.
66+
You must be willing to engage in discussion and respond to any questions, comments,
67+
or suggestions we may have.
5068

5169
### Signing commits
5270

5371
To improve contribution tracking,
5472
we use the [Canonical contributor license agreement](https://assets.ubuntu.com/v1/ff2478d1-Canonical-HA-CLA-ANY-I_v1.2.pdf)
5573
(CLA) as a legal sign-off, and we require all commits to have verified signatures.
5674

57-
### Canonical contributor agreement
75+
#### Canonical contributor agreement
76+
77+
Canonical welcomes contributions to the GitHub runner Operator. Please check out our
78+
[contributor agreement](https://ubuntu.com/legal/contributors) if you're interested in contributing to the solution.
5879

59-
Canonical welcomes contributions to this repository. Please check out our [contributor agreement](https://ubuntu.com/legal/contributors) if you’re interested in contributing to the solution.
80+
The CLA sign-off is simple line at the
81+
end of the commit message certifying that you wrote it
82+
or have the right to commit it as an open-source contribution.
6083

6184
#### Verified signatures on commits
6285

@@ -87,7 +110,6 @@ We like to follow idomatic Go practices and community standards when writing Go
87110
We have added an instruction file `go.instructions.md` in `.github/instructions.md` that is used by GitHub Copilot to help you write code that follows these practices.
88111
We have added a [Style Guide](./STYLE.md) that you can refer to for more details.
89112

90-
91113
### Test
92114

93115
This project uses standard Go testing tools for unit tests and integration tests.
@@ -169,8 +191,6 @@ Higher complexity leads to code that is harder to read, understand, test and mai
169191
There are exceptions where higher complexity is justified (e.g., validation, initialization),
170192
but those should require explicit justification using `nolint` directives.
171193

172-
173-
174194
### Charm development
175195

176196
The charm uses the [12 factor app pattern](https://canonical-12-factor-app-support.readthedocs-hosted.com/latest/).

docs/changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1+
(changelog)=
2+
13
# Changelog
24

35
This changelog documents user-relevant changes to the Planner charm and Webhook gateway charm.
46

7+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
8+
9+
Each revision is versioned by the date of the revision.
10+
511
## 2026-04-13
612

713
- add 5xx error logging to planner routes.

docs/how-to/contribute.rst

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
.. meta::
2+
:description: Familiarize yourself with contributing to the GitHub runner charms documentation.
3+
4+
.. _how_to_contribute:
5+
6+
How to contribute
7+
=================
8+
9+
.. note::
10+
11+
See `CONTRIBUTING.md <https://github.com/canonical/github-runner-operators/blob/main/CONTRIBUTING.md>`_
12+
for information on contributing to the source code.
13+
14+
Our documentation is hosted on `Read the Docs <https://documentation.ubuntu.com/github-runner-operators>`_ to enable collaboration.
15+
Please use the links on each documentation page to either
16+
directly change something you see that's wrong, ask a question, or make a suggestion
17+
about a potential change.
18+
19+
Our documentation is also available alongside the
20+
`source code on GitHub <https://github.com/canonical/github-runner-operators>`_.
21+
You may open a pull request with your documentation changes, or you can
22+
`file a bug <https://github.com/canonical/github-runner-operators/issues>`_
23+
to provide constructive feedback or suggestions.
24+
25+
AI usage
26+
--------
27+
28+
You are free to use any tools you want while preparing your contribution, including
29+
AI, provided that you do so lawfully and ethically.
30+
31+
Avoid using AI to complete
32+
`Canonical Open Documentation Academy issues <https://github.com/canonical/open-documentation-academy/issues>`_.
33+
The purpose of these issues is to provide newcomers with opportunities to
34+
contribute to our projects and gain documentation skills. Using AI to
35+
complete these tasks undermines their purpose.
36+
37+
If you use AI to help with your PRs, be mindful. Avoid submitting contributions
38+
with entirely AI-generated documentation. The human aspect of documentation is
39+
important to us, and that includes tone, syntax, perspectives, and the
40+
occasional typo.
41+
42+
Some examples of valid AI assistance includes:
43+
44+
* Checking for spelling or grammar errors
45+
* Drafting plans or outlines
46+
* Checking that your contribution aligns with the Canonical style guide
47+
48+
We have created instructions and tools that you can provide AI while preparing
49+
your contribution in `copilot-collections <https://github.com/canonical/copilot-collections>`_.
50+
While it isn't necessary to use ``copilot-collections`` while preparing your
51+
contribution, these files contain details about our documentation standards and
52+
practices that will help the AI avoid common pitfalls when interacting with our
53+
projects. By using these tools, you can avoid longer review times and nitpicks.
54+
55+
If you choose to use AI, please disclose this information to us by indicating
56+
AI usage in the PR description (for instance, marking the checklist item about
57+
AI usage). You don't need to go into explicit details about how and where you used AI.
58+
59+
Avoid submitting contributions that you don't fully understand.
60+
You are responsible for the entire contribution, including the AI-assisted portions.
61+
You must be willing to engage in discussion and respond to any questions, comments,
62+
or suggestions we may have.
63+

docs/how-to/index.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
How-to guides
22
=============
3+
4+
The following guides cover key processes and common tasks for managing and using the GitHub runner charms.
5+
6+
.. toctree::
7+
:maxdepth: 1
8+
9+
Contribute <contribute>

0 commit comments

Comments
 (0)