diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 83fa87b8e..1d9613f04 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -39,4 +39,6 @@ jobs: uses: actions/checkout@v2 - name: Build + env: + CGO_ENABLED: '0' run: go build -v ./cmd/gh diff --git a/.goreleaser.yml b/.goreleaser.yml index 0f0d64ae2..2f6d16f32 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -25,6 +25,8 @@ builds: id: linux goos: [linux] goarch: [386, arm, amd64, arm64] + env: + - CGO_ENABLED=0 - <<: *build_defaults id: windows diff --git a/Makefile b/Makefile index 22f3672b7..e29d67b07 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ CGO_CPPFLAGS ?= ${CPPFLAGS} export CGO_CPPFLAGS CGO_CFLAGS ?= ${CFLAGS} export CGO_CFLAGS -CGO_LDFLAGS ?= ${LDFLAGS} +CGO_LDFLAGS ?= $(filter -g -L% -l% -O%,${LDFLAGS}) export CGO_LDFLAGS GO_LDFLAGS := -X github.com/cli/cli/internal/build.Version=$(GH_VERSION) $(GO_LDFLAGS) diff --git a/docs/install_linux.md b/docs/install_linux.md index 697bfb8f8..4fe314777 100644 --- a/docs/install_linux.md +++ b/docs/install_linux.md @@ -1,4 +1,4 @@ -# Installing gh on Linux +# Installing gh on Linux and FreeBSD Packages downloaded from https://cli.github.com or from https://github.com/cli/cli/releases are considered official binaries. We focus on popular Linux distros and @@ -101,6 +101,20 @@ Android 7+ users can install via [Termux](https://wiki.termux.com/wiki/Main_Page pkg install gh ``` +### FreeBSD + +FreeBSD users can install from the [ports collection](https://www.freshports.org/devel/gh/): + +```bash +cd /usr/ports/devel/gh/ && make install clean +``` + +Or via [pkg(8)](https://www.freebsd.org/cgi/man.cgi?pkg(8)): + +```bash +pkg install gh +``` + ### Gentoo Gentoo Linux users can install from the [main portage tree](https://packages.gentoo.org/packages/dev-util/github-cli): diff --git a/pkg/cmd/pr/merge/merge.go b/pkg/cmd/pr/merge/merge.go index d72ed2ca0..abd761807 100644 --- a/pkg/cmd/pr/merge/merge.go +++ b/pkg/cmd/pr/merge/merge.go @@ -123,9 +123,6 @@ func mergeRun(opts *MergeOptions) error { if pr.Mergeable == "CONFLICTING" { err := fmt.Errorf("%s Pull request #%d (%s) has conflicts and isn't mergeable ", cs.Red("!"), pr.Number, pr.Title) return err - } else if pr.Mergeable == "UNKNOWN" { - err := fmt.Errorf("%s Pull request #%d (%s) can't be merged right now; try again in a few seconds", cs.Red("!"), pr.Number, pr.Title) - return err } else if pr.State == "MERGED" { err := fmt.Errorf("%s Pull request #%d (%s) was already merged", cs.Red("!"), pr.Number, pr.Title) return err