Skip to content

[pull] trunk from cli:trunk#326

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.

Sign up for GitHub

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

Merged
pull merged 6 commits into from
Sep 2, 2026
Merged

[pull] trunk from cli:trunk #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7be4c29
Fix discussion acceptance test flags
williammartin Sep 2, 2026
0da5ee8
Merge pull request #14321 from cli/williammartin-fix-discussion-accep…
williammartin Sep 2, 2026
905e868
Clarify supported GHES versions
williammartin Sep 2, 2026
09850d5
Use version-neutral GHES support link
williammartin Sep 2, 2026
b94691d
Refine GHES support wording
williammartin Sep 2, 2026
9d36fee
Merge pull request #14324 from cli/williammartin-github-mercy-preview
williammartin Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

![screenshot of gh pr status](https://user-images.githubusercontent.com/98482/84171218-327e7a80-aa40-11ea-8cd1-5177fc2d0e72.png)

GitHub CLI is supported for users on GitHub.com, GitHub Enterprise Cloud, and GitHub Enterprise Server 2.20+ with support for macOS, Windows, and Linux.
GitHub CLI is supported for users on GitHub.com, GitHub Enterprise Cloud, and [supported GitHub Enterprise Server versions](https://docs.github.com/en/enterprise-server/admin/all-releases), with support for macOS, Windows, and Linux.

## Documentation

Expand Down
6 changes: 3 additions & 3 deletions acceptance/testdata/discussion/discussion-comment.txtar
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ exec gh discussion comment $DISCUSSION_URL --body-file $WORK/comment-body.txt
stdout 'discussioncomment'

# Verify comments appear in view
exec gh discussion view $DISCUSSION_URL --comments --order oldest --json comments
exec gh discussion view $DISCUSSION_URL --order oldest --json comments
stdout2env COMMENTS_JSON
jq-assert COMMENTS_JSON '.comments.nodes | length' '^2$'
jq-assert COMMENTS_JSON '.comments.nodes[0].body' 'Comment from flag'
Expand DownExpand Up@@ -72,7 +72,7 @@ exec gh discussion comment $SECOND_REPLY_ID --edit --body-file $WORK/edit-reply-
stdout 'discussioncomment'

# Verify edits appear
exec gh discussion view $DISCUSSION_URL --comments --order oldest --json comments
exec gh discussion view $DISCUSSION_URL --order oldest --json comments
stdout2env EDITED_COMMENTS_JSON
jq-assert EDITED_COMMENTS_JSON '.comments.nodes[0].body' 'Edited first comment'
jq-assert EDITED_COMMENTS_JSON '.comments.nodes[0].replies.nodes[0].body' 'Edited first reply'
Expand All@@ -91,7 +91,7 @@ exec gh discussion comment $SECOND_COMMENT_ID --delete --yes
exec gh discussion comment $SECOND_REPLY_ID --delete --yes

# Verify deletion
exec gh discussion view $DISCUSSION_URL --comments --order oldest --json comments
exec gh discussion view $DISCUSSION_URL --order oldest --json comments
stdout2env DELETED_COMMENTS_JSON
jq-assert DELETED_COMMENTS_JSON '.comments.nodes | length' '^1$'
jq-assert DELETED_COMMENTS_JSON '.comments.nodes[0].body' 'Edited first comment'
Expand Down
2 changes: 1 addition & 1 deletion acceptance/testdata/discussion/discussion-list.txtar
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ exec gh discussion create --title 'Second Discussion' --body 'Second body' --cat
exec gh discussion create --title 'QA Discussion' --body 'QA body' --category 'Q&A'
stdout2env QA_URL
exec gh discussion comment $QA_URL --body 'This is the answer'
exec gh discussion view $QA_URL --comments --json comments --jq '.comments.nodes[0].id'
exec gh discussion view $QA_URL --json comments --jq '.comments.nodes[0].id'
stdout2env QA_COMMENT_ID
exec gh api graphql -f query='mutation { markDiscussionCommentAsAnswer(input: {id: "'$QA_COMMENT_ID'"}) { discussion { id } } }'

Expand Down
Loading