update setdefault test

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,3 +24,5 @@ A clear and concise description of what you expected to happen and what actually
 ### Logs
 
 Paste the activity from your command line. Redact if needed.
+
+<!-- Note: Set `GH_DEBUG=true` for verbose logs or `GH_DEBUG=api` for verbose logs with HTTP traffic details. -->

.github/workflows/deployment.yml

@@ -6,7 +6,9 @@ concurrency:
   cancel-in-progress: true
 
 permissions:
+  attestations: write
   contents: write
+  id-token: write
 
 on:
   workflow_dispatch:
@@ -38,7 +40,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
       - name: Install GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: "~1.17.1"
           install-only: true
@@ -90,7 +92,7 @@ jobs:
           security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$keychain_password" "$keychain"
           rm "$RUNNER_TEMP/cert.p12"
       - name: Install GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: "~1.17.1"
           install-only: true
@@ -108,6 +110,19 @@ jobs:
         run: |
           shopt -s failglob
           script/sign dist/gh_*_macOS_*.zip
+      - name: Build universal macOS pkg installer
+        if: inputs.environment != 'production'
+        env:
+          TAG_NAME: ${{ inputs.tag_name }}
+        run: script/pkgmacos "$TAG_NAME"
+      - name: Build & notarize universal macOS pkg installer
+        if: inputs.environment == 'production'
+        env:
+          TAG_NAME: ${{ inputs.tag_name }}
+          APPLE_DEVELOPER_INSTALLER_ID: ${{ vars.APPLE_DEVELOPER_INSTALLER_ID }}
+        run: |
+          shopt -s failglob
+          script/pkgmacos "$TAG_NAME"
       - uses: actions/upload-artifact@v4
         with:
           name: macos
@@ -116,7 +131,8 @@ jobs:
           path: |
             dist/*.tar.gz
             dist/*.zip
-
+            dist/*.pkg
+
   windows:
     runs-on: windows-latest
     environment: ${{ inputs.environment }}
@@ -129,7 +145,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
       - name: Install GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: "~1.17.1"
           install-only: true
@@ -281,6 +297,11 @@ jobs:
         run: |
           cp script/rpmmacros ~/.rpmmacros
           rpmsign --addsign dist/*.rpm
+      - name: Attest release artifacts
+        if: inputs.environment == 'production'
+        uses: actions/attest-build-provenance@310b0a4a3b0b78ef57ecda988ee04b132db73ef8 # v1.4.1
+        with:
+          subject-path: "dist/gh_*"
       - name: Run createrepo
         env:
           GPG_SIGN: ${{ inputs.environment == 'production' }}

.github/workflows/go.yml

@@ -24,8 +24,8 @@ jobs:
       - name: Download dependencies
         run: go mod download
 
-      - name: Run tests
-        run: go test -race ./...
+      - name: Run unit and integration tests
+        run: go test -race -tags=integration ./...
 
       - name: Build
         run: go build -v ./cmd/gh

.github/workflows/lint.yml

@@ -32,7 +32,7 @@ jobs:
           go mod verify
           go mod download
 
-          LINT_VERSION=1.54.1
+          LINT_VERSION=1.59.1
           curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \
             tar xz --strip-components 1 --wildcards \*/golangci-lint
           mkdir -p bin && mv golangci-lint bin/

.gitignore

@@ -12,6 +12,8 @@
 /.goreleaser.generated.yml
 /script/build
 /script/build.exe
+/pkg_payload
+/build/macOS/resources
 
 # VS Code
 .vscode

.goreleaser.yml

@@ -7,11 +7,10 @@ release:
 
 before:
   hooks:
-    - >-
+    - >- # The linux and windows archives package the manpages below
       {{ if eq .Runtime.Goos "windows" }}echo{{ end }} make manpages GH_VERSION={{.Version}}
-    - >-
-      {{ if ne .Runtime.Goos "linux" }}echo{{ end }} make completions
-
+    - >- # On linux the completions are used in nfpms below, but on macos they are used outside in the deployment build.
+      {{ if eq .Runtime.Goos "windows" }}echo{{ end }} make completions
 builds:
   - id: macos #build:macos
     goos: [darwin]

Makefile

@@ -93,3 +93,11 @@ uninstall:
 	rm -f ${DESTDIR}${datadir}/bash-completion/completions/gh
 	rm -f ${DESTDIR}${datadir}/fish/vendor_completions.d/gh.fish
 	rm -f ${DESTDIR}${datadir}/zsh/site-functions/_gh
+
+.PHONY: macospkg
+macospkg: manpages completions
+ifndef VERSION
+	$(error VERSION is not set. Use `make macospkg VERSION=vX.Y.Z`)
+endif
+	./script/release --local "$(VERSION)" --platform macos
+	./script/pkgmacos $(VERSION)

README.md

@@ -21,7 +21,10 @@ If you are a hubber and are interested in shipping new commands for the CLI, che
 
 ### macOS
 
-`gh` is available via [Homebrew][], [MacPorts][], [Conda][], [Spack][], [Webi][], and as a downloadable binary from the [releases page][].
+`gh` is available via [Homebrew][], [MacPorts][], [Conda][], [Spack][], [Webi][], and as a downloadable binary including Mac OS installer `.pkg` from the [releases page][].
+
+> [!NOTE]
+> As of May 29th, Mac OS installer `.pkg` are unsigned with efforts prioritized in [`cli/cli#9139`](https://github.com/cli/cli/issues/9139) to support signing them.
 
 #### Homebrew
 
@@ -57,6 +60,14 @@ Additional Conda installation options available on the [gh-feedstock page](https
 
 For more information about the Webi installer see [its homepage](https://webinstall.dev/).
 
+#### Flox
+
+| Install:          | Upgrade:                |
+| ----------------- | ----------------------- |
+| `flox install gh` | `flox upgrade toplevel` |
+
+For more information about Flox, see [its homepage](https://flox.dev)
+
 ### Linux & BSD
 
 `gh` is available via:

api/queries_branch_issue_reference.go

@@ -138,6 +138,9 @@ func FindRepoBranchID(client *Client, repo ghrepo.Interface, ref string) (string
 
 	branchID := query.Repository.Ref.Target.Oid
 	if branchID == "" {
+		if ref != "" {
+			return "", "", fmt.Errorf("could not find branch %q in %s", ref, ghrepo.FullName(repo))
+		}
 		branchID = query.Repository.DefaultBranchRef.Target.Oid
 	}
 

api/queries_issue.go

@@ -286,7 +286,7 @@ func IssueStatus(client *Client, repo ghrepo.Interface, options IssueStatusOptio
 				}
 			}
 		}
-    }`
+	}`
 
 	variables := map[string]interface{}{
 		"owner":  repo.RepoOwner(),

api/queries_pr.go

@@ -16,8 +16,17 @@ type PullRequestAndTotalCount struct {
 	SearchCapped bool
 }
 
+type PullRequestMergeable string
+
+const (
+	PullRequestMergeableConflicting PullRequestMergeable = "CONFLICTING"
+	PullRequestMergeableMergeable   PullRequestMergeable = "MERGEABLE"
+	PullRequestMergeableUnknown     PullRequestMergeable = "UNKNOWN"
+)
+
 type PullRequest struct {
 	ID                  string
+	FullDatabaseID      string
 	Number              int
 	Title               string
 	State               string
@@ -27,7 +36,7 @@ type PullRequest struct {
 	HeadRefName         string
 	HeadRefOid          string
 	Body                string
-	Mergeable           string
+	Mergeable           PullRequestMergeable
 	Additions           int
 	Deletions           int
 	ChangedFiles        int
@@ -607,6 +616,18 @@ func UpdatePullRequestReviews(client *Client, repo ghrepo.Interface, params gith
 	return err
 }
 
+func UpdatePullRequestBranch(client *Client, repo ghrepo.Interface, params githubv4.UpdatePullRequestBranchInput) error {
+	var mutation struct {
+		UpdatePullRequestBranch struct {
+			PullRequest struct {
+				ID string
+			}
+		} `graphql:"updatePullRequestBranch(input: $input)"`
+	}
+	variables := map[string]interface{}{"input": params}
+	return client.Mutate(repo.RepoHost(), "PullRequestUpdateBranch", &mutation, variables)
+}
+
 func isBlank(v interface{}) bool {
 	switch vv := v.(type) {
 	case string:
@@ -696,3 +717,44 @@ func BranchDeleteRemote(client *Client, repo ghrepo.Interface, branch string) er
 	path := fmt.Sprintf("repos/%s/%s/git/refs/heads/%s", repo.RepoOwner(), repo.RepoName(), url.PathEscape(branch))
 	return client.REST(repo.RepoHost(), "DELETE", path, nil, nil)
 }
+
+type RefComparison struct {
+	AheadBy  int
+	BehindBy int
+	Status   string
+}
+
+func ComparePullRequestBaseBranchWith(client *Client, repo ghrepo.Interface, prNumber int, headRef string) (*RefComparison, error) {
+	query := `query ComparePullRequestBaseBranchWith($owner: String!, $repo: String!, $pullRequestNumber: Int!, $headRef: String!) {
+		repository(owner: $owner, name: $repo) {
+			pullRequest(number: $pullRequestNumber) {
+				baseRef {
+					compare (headRef: $headRef) {
+						aheadBy, behindBy, status
+					}
+				}
+			}
+		}
+	}`
+
+	var result struct {
+		Repository struct {
+			PullRequest struct {
+				BaseRef struct {
+					Compare RefComparison
+				}
+			}
+		}
+	}
+	variables := map[string]interface{}{
+		"owner":             repo.RepoOwner(),
+		"repo":              repo.RepoName(),
+		"pullRequestNumber": prNumber,
+		"headRef":           headRef,
+	}
+
+	if err := client.GraphQL(repo.RepoHost(), query, variables, &result); err != nil {
+		return nil, err
+	}
+	return &result.Repository.PullRequest.BaseRef.Compare, nil
+}

api/query_builder.go

@@ -152,13 +152,13 @@ func StatusCheckRollupGraphQLWithCountByState() string {
 					contexts {
 						checkRunCount,
 						checkRunCountsByState {
-						  state,
-						  count
+							state,
+							count
 						},
 						statusContextCount,
 						statusContextCountsByState {
-						  state,
-						  count
+							state,
+							count
 						}
 					}
 				}
@@ -249,7 +249,7 @@ func RequiredStatusCheckRollupGraphQL(prID, after string, includeEvent bool) str
 	}`), afterClause, prID, eventField)
 }
 
-var IssueFields = []string{
+var sharedIssuePRFields = []string{
 	"assignees",
 	"author",
 	"body",
@@ -270,14 +270,26 @@ var IssueFields = []string{
 	"url",
 }
 
-var PullRequestFields = append(IssueFields,
+// Some fields are only valid in the context of issues.
+// They need to be enumerated separately in order to be filtered
+// from existing code that expects to be able to pass Issue fields
+// to PR queries, e.g. the PullRequestGraphql function.
+var issueOnlyFields = []string{
+	"isPinned",
+	"stateReason",
+}
+
+var IssueFields = append(sharedIssuePRFields, issueOnlyFields...)
+
+var PullRequestFields = append(sharedIssuePRFields,
 	"additions",
 	"autoMergeRequest",
 	"baseRefName",
 	"changedFiles",
 	"commits",
 	"deletions",
 	"files",
+	"fullDatabaseId",
 	"headRefName",
 	"headRefOid",
 	"headRepository",
@@ -363,10 +375,9 @@ func IssueGraphQL(fields []string) string {
 // PullRequestGraphQL constructs a GraphQL query fragment for a set of pull request fields.
 // It will try to sanitize the fields to just those available on pull request.
 func PullRequestGraphQL(fields []string) string {
-	invalidFields := []string{"isPinned", "stateReason"}
 	s := set.NewStringSet()
 	s.AddValues(fields)
-	s.RemoveValues(invalidFields)
+	s.RemoveValues(issueOnlyFields)
 	return IssueGraphQL(s.ToSlice())
 }
 

build/macOS/distribution.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<installer-gui-script minSpecVersion="2">
+    <title>GitHub CLI</title>
+    <license file="LICENSE" mime-type="text/plain"/>
+    <options hostArchitectures="arm64,x86_64" customize="never" require-scripts="true" allow-external-scripts="false"/>
+    <domains enable_localSystem="true"/>
+    <installation-check script="installCheck();"/>
+    <script>
+    function installCheck() {
+        // this check is redundant, but it produces a user friendly error message
+        // compared to a disabled install button caused by allowed-os-versions
+        if (!(system.compareVersions(system.version.ProductVersion, '12') &gt;= 0)) {
+            my.result.title = 'Unable to install';
+            my.result.message = 'GitHub CLI requires macOS 12 or later.';
+            my.result.type = 'Fatal';
+            return false;
+        }
+        return true;
+    }
+    </script>
+    <allowed-os-versions>
+        <os-version min="12.0" />
+    </allowed-os-versions>
+
+    <choices-outline>
+        <line choice="gh-cli"/>
+    </choices-outline>
+    <choice id="gh-cli" title="GitHub CLI (universal)">
+        <pkg-ref id="com.github.cli.pkg"/>
+    </choice>
+
+    <pkg-ref id="com.github.cli.pkg" auth="root">#com.github.cli.pkg</pkg-ref>
+</installer-gui-script>

cmd/gen-docs/main.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/cli/cli/v2/internal/config"
 	"github.com/cli/cli/v2/internal/docs"
+	"github.com/cli/cli/v2/internal/gh"
 	"github.com/cli/cli/v2/internal/ghrepo"
 	"github.com/cli/cli/v2/pkg/cmd/root"
 	"github.com/cli/cli/v2/pkg/cmdutil"
@@ -48,7 +49,7 @@ func run(args []string) error {
 	rootCmd, _ := root.NewCmdRoot(&cmdutil.Factory{
 		IOStreams: ios,
 		Browser:   &browser{},
-		Config: func() (config.Config, error) {
+		Config: func() (gh.Config, error) {
 			return config.NewFromString(""), nil
 		},
 		ExtensionManager: &em{},