Skip to content

Commit ac0f2a2

Browse files
authored
Merge branch 'cli:trunk' into trunk
2 parents 31f753c + 5d3c2ba commit ac0f2a2

860 files changed

Lines changed: 81946 additions & 11549 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "mcr.microsoft.com/devcontainers/go:1.22",
2+
"image": "mcr.microsoft.com/devcontainers/go:1.25",
33
"features": {
44
"ghcr.io/devcontainers/features/sshd:1": {}
55
},

.github/CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
pkg/cmd/codespace/ @cli/codespaces
44
internal/codespaces/ @cli/codespaces
55

6-
# Limit Package Security team ownership to the attestation command package
6+
# Limit Package Security team ownership to the attestation command package and related integration tests
77
pkg/cmd/attestation/ @cli/package-security
8+
pkg/cmd/release/attestation/ @cli/package-security
9+
pkg/cmd/release/verify/ @cli/package-security
10+
pkg/cmd/release/verify-asset/ @cli/package-security
11+
pkg/cmd/release/shared/ @cli/package-security
12+
13+
test/integration/attestation-cmd @cli/package-security
814

915
pkg/cmd/attestation/verification/embed/tuf-repo.github.com/ @cli/tuf-root-reviewers

.github/CONTRIBUTING.md

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22

33
Hi! Thanks for your interest in contributing to the GitHub CLI!
44

5-
We accept pull requests for bug fixes and features where we've discussed the approach in an issue and given the go-ahead for a community member to work on it. We'd also love to hear about ideas for new features as issues.
5+
We accept pull requests for issues labelled `help wanted`. We encourage issues and discussion posts for all other contributions.
66

7-
Please do:
7+
### Please do:
88

9-
* Check existing issues to verify that the [bug][bug issues] or [feature request][feature request issues] has not already been submitted.
10-
* Open an issue if things aren't working as expected.
11-
* Open an issue to propose a significant change.
12-
* Open a pull request to fix a bug.
13-
* Open a pull request to fix documentation about a command.
14-
* Open a pull request for any issue labelled [`help wanted`][hw] or [`good first issue`][gfi].
9+
* Check issues to verify that a [bug][bug issues] or [feature request][feature request issues] issue does not already exist for the same problem or feature
10+
* Open an issue if things aren't working as expected
11+
* Open an issue to propose a change
12+
* Open an issue to propose a design for an issue labelled [`needs-design` and `help wanted`][needs design and help wanted], following the [proposing a design guidelines](#proposing-a-design) instructions below
13+
* Open an issue to propose a new community supported `gh` package with details about support and redistribution
14+
* Mention `@cli/code-reviewers` when an issue you want to work on does not have clear Acceptance Criteria
15+
* Open a pull request for any issue labelled [`help wanted`][hw] and [`good first issue`][gfi]
1516

16-
Please avoid:
17+
### Please _do NOT_:
1718

18-
* Opening pull requests for issues marked `needs-design`, `needs-investigation`, or `blocked`.
19-
* Opening pull requests that haven't been approved for work in an issue
20-
* Adding installation instructions specifically for your OS/package manager.
21-
* Opening pull requests for any issue marked `core`. These issues require additional context from
22-
the core CLI team at GitHub and any external pull requests will not be accepted.
19+
* Open a pull request for issues without the `help wanted` label or explicit Acceptance Criteria
20+
* Expand pull request scope to include changes that are not described in the issue's Acceptance Criteria
21+
* Open pull requests for any issue marked `core`. These issues require additional context from
22+
the core CLI team at GitHub and any external pull requests will not be accepted
2323

2424
## Building the project
2525

2626
Prerequisites:
27-
- Go 1.22+
27+
- Go 1.26+
2828

2929
Build with:
3030
* Unix-like systems: `make`
@@ -52,7 +52,21 @@ We generate manual pages from source on every release. You do not need to submit
5252

5353
## Design guidelines
5454

55-
You may reference the [CLI Design System][] when suggesting features, and are welcome to use our [Google Docs Template][] to suggest designs.
55+
### Proposing a design
56+
57+
You may propose a design to solve an open bug or feature request issue that has both [the `needs-design` and `help-wanted` labels][needs design and help wanted].
58+
59+
To propose a design:
60+
61+
- Open a new issue using the [design proposal issue template](./ISSUE_TEMPLATE/submit-a-design-proposal.md).
62+
- Include a link to the issue that the design is for.
63+
- Describe the design you are proposing to resolve the issue, leveraging the [CLI Design System][].
64+
- Mock up the design you are proposing using our [Google Docs Template][] or code blocks.
65+
- Mock ups should clearly illustrate the command(s) being run and the expected output(s).
66+
67+
### (core team only) Reviewing a design
68+
69+
A member of the core team will [triage](../docs/triage.md) the design proposal. Once a member of the core team has reviewed the design, they may add the [`help wanted`][hw] label to the issue, so a PR can be opened to provide the implementation.
5670

5771
## Resources
5872

@@ -62,6 +76,7 @@ You may reference the [CLI Design System][] when suggesting features, and are we
6276

6377

6478
[bug issues]: https://github.com/cli/cli/issues?q=is%3Aopen+is%3Aissue+label%3Abug
79+
[needs design and help wanted]: https://github.com/cli/cli/issues?q=state%3Aclosed%20is%3Aissue%20label%3Aneeds-design%20label%3A%22help%20wanted%22
6580
[feature request issues]: https://github.com/cli/cli/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement
6681
[hw]: https://github.com/cli/cli/labels/help%20wanted
6782
[gfi]: https://github.com/cli/cli/labels/good%20first%20issue
@@ -71,5 +86,5 @@ You may reference the [CLI Design System][] when suggesting features, and are we
7186
[How to Contribute to Open Source]: https://opensource.guide/how-to-contribute/
7287
[Using Pull Requests]: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/about-pull-requests
7388
[GitHub Help]: https://docs.github.com/
74-
[CLI Design System]: https://primer.style/cli/
89+
[CLI Design System]: /docs/primer/
7590
[Google Docs Template]: https://docs.google.com/document/d/1JIRErIUuJ6fTgabiFYfCH3x91pyHuytbfa0QLnTfXKM/edit#heading=h.or54sa47ylpg

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
name: "\U0001F41B Bug report"
33
about: Report a bug or unexpected behavior while using GitHub CLI
44
title: ''
5-
labels: bug
5+
labels: ''
66
assignees: ''
77

88
---
99

1010
### Describe the bug
1111

12-
A clear and concise description of what the bug is. Include version by typing `gh --version`.
12+
A clear and concise description of what the bug is.
13+
14+
### Affected version
15+
16+
Please run `gh version` and paste the output below.
1317

1418
### Steps to reproduce the behavior
1519

@@ -24,3 +28,5 @@ A clear and concise description of what you expected to happen and what actually
2428
### Logs
2529

2630
Paste the activity from your command line. Redact if needed.
31+
32+
<!-- Note: Set `GH_DEBUG=true` for verbose logs or `GH_DEBUG=api` for verbose logs with HTTP traffic details. -->

.github/ISSUE_TEMPLATE/feedback.md

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
name: "🎨 Submit a design proposal"
3+
about: Submit a design to resolve an open issue that has both `needs-design` and `help-wanted` labels
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- See [CONTRIBUTING.md](../CONTRIBUTING.md#proposing-a-design) for more information.-->
11+
12+
### Link to issue for design submission
13+
14+
<!--
15+
Provide a link to the issue this design is for.
16+
17+
All design submissions must be linked to an open issue that
18+
has both the `needs-design` and `help-wanted` labels.
19+
-->
20+
21+
### Proposed Design
22+
23+
<!--
24+
Describe the design you are proposing to resolve the issue.
25+
26+
All CLI designs must adhere to the [Primer CLI design reference](https://primer.style/cli/).
27+
-->
28+
29+
### Mockup
30+
31+
<!--
32+
Provide a mockup of the design you are proposing. All mockups should clearly illustrate the command(s) being run and the expected output(s).
33+
34+
When color and formatting are important, consider using our [CLI design Google Docs Template](https://docs.google.com/document/d/1JIRErIUuJ6fTgabiFYfCH3x91pyHuytbfa0QLnTfXKM/edit#heading=h.or54sa47ylpg).
35+
36+
Code blocks can also be used to submit a design mockup - remember to include the command(s) being run. Example:
37+
38+
```shell
39+
$ gh issue list --json title -L 5
40+
[
41+
{
42+
"title": "`gh pr checks <pr> --required` should not fail when there are no required checks"
43+
},
44+
{
45+
"title": "gh pr view commits should include commit description"
46+
},
47+
{
48+
"title": "Adapt the color of the device code to the color used by the terminal"
49+
},
50+
{
51+
"title": "`gh pr create` does not default to fork when user has write access to upstream"
52+
},
53+
{
54+
"title": "First party discussions support"
55+
}
56+
]
57+
```
58+
-->

.github/ISSUE_TEMPLATE/submit-a-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "⭐ Submit a request"
33
about: Surface a feature or problem that you think should be solved
44
title: ''
5-
labels: enhancement
5+
labels: ''
66
assignees: ''
77

88
---

.github/SECURITY.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ GitHub takes the security of our software products and services seriously, inclu
22

33
If you believe you have found a security vulnerability in GitHub CLI, you can report it to us in one of two ways:
44

5-
* Report it to this repository directly using [private vulnerability reporting][]. Such reports are not eligible for a bounty reward.
5+
* Report it to this repository directly using [private vulnerability reporting][].
6+
* Include a description of your investigation of the GitHub CLI's codebase and why you believe an exploit is possible.
7+
* POCs and links to code are greatly encouraged.
8+
* Such reports are not eligible for a bounty reward.
69

710
* Submit the report through [HackerOne][] to be eligible for a bounty reward.
811

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ updates:
77
ignore:
88
- dependency-name: "*"
99
update-types:
10-
- version-update:semver-minor
1110
- version-update:semver-major
1211
- package-ecosystem: "github-actions"
1312
directory: "/"

.github/licenses.tmpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
GitHub CLI third-party dependencies
2+
====================================
3+
4+
The following open source dependencies are used to build the GitHub CLI.
5+
6+
{{ range . -}}
7+
{{.Name}} ({{.Version}}) - {{.LicenseName}} - {{.LicenseURL}}
8+
{{ end }}

0 commit comments

Comments
 (0)