From 6c5b690bbec934034826b2c34ee0ee86d3b80e6f Mon Sep 17 00:00:00 2001 From: vilmibm Date: Wed, 19 May 2021 12:13:29 -0500 Subject: [PATCH 1/4] simplify deb installation docs --- docs/install_linux.md | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/docs/install_linux.md b/docs/install_linux.md index da4d7169c..9ffd91b3a 100644 --- a/docs/install_linux.md +++ b/docs/install_linux.md @@ -2,7 +2,7 @@ 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 -the following CPU architectures: `i386`, `amd64`, `arm64`. +the following CPU architectures: `i386`, `amd64`, `arm64`, `armhf`. Other sources for installation are community-maintained and thus might lag behind our release schedule. @@ -13,30 +13,17 @@ If none of our official binaries, packages, repositories, nor community sources ### Debian, Ubuntu Linux (apt) -Install (Using apt-key): +This will only work for the deb-based distributions we [explicitly support](/.github/workflows/releases.yml#L83) and the [architectures we officially support](/.goreleaser.yml#L27). ```bash -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 -sudo apt-add-repository https://cli.github.com/packages -sudo apt update -sudo apt install gh -``` - -**Note**: If you are behind a firewall, the connection to `keyserver.ubuntu.com` might fail. In that case, try running `sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C99B11DEB97541F0`. - -**Note**: If you get _"gpg: failed to start the dirmngr '/usr/bin/dirmngr': No such file or directory"_ error, try installing the `dirmngr` package. Run `sudo apt-get install dirmngr` and repeat the steps above. - -**Note**: most systems will have `apt-add-repository` already. If you get a _command not found_ -error, try running `sudo apt install software-properties-common` and trying these steps again. - -Install (without add-apt-repository, with limited keyring scope): -```bash -sudo apt-key --keyring /usr/share/keyrings/githubcli-archive-keyring.gpg adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 +curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/github-cli2.list > /dev/null sudo apt update sudo apt install gh ``` +**Note**: If you get _"gpg: failed to start the dirmngr '/usr/bin/dirmngr': No such file or directory"_ error, try installing the `dirmngr` package. Run `sudo apt-get install dirmngr` and repeat the steps above. + Upgrade: ```bash From 320ab8ad31769468e237dea08086d6de17ea5f35 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Wed, 19 May 2021 16:20:01 -0500 Subject: [PATCH 2/4] restore header, use an emoji --- docs/install_linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/install_linux.md b/docs/install_linux.md index 9ffd91b3a..25eb01b5e 100644 --- a/docs/install_linux.md +++ b/docs/install_linux.md @@ -13,7 +13,9 @@ If none of our official binaries, packages, repositories, nor community sources ### Debian, Ubuntu Linux (apt) -This will only work for the deb-based distributions we [explicitly support](/.github/workflows/releases.yml#L83) and the [architectures we officially support](/.goreleaser.yml#L27). +:warning: This will only work for the deb-based distributions we [explicitly support](/.github/workflows/releases.yml#L83) and the [architectures we officially support](/.goreleaser.yml#L27). + +Install: ```bash curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg From 2d704ba5910fe48111dd7e623c95d0b4ada79e12 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Wed, 19 May 2021 16:51:58 -0500 Subject: [PATCH 3/4] bonus: support sid --- .github/workflows/releases.yml | 2 +- script/distributions | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 7066ef561..c5d8011d7 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -80,7 +80,7 @@ jobs: popd - name: Run reprepro env: - RELEASES: "cosmic eoan disco groovy focal stable oldstable testing unstable buster bullseye stretch jessie bionic trusty precise xenial hirsute impish kali-rolling" + RELEASES: "cosmic eoan disco groovy focal stable oldstable testing sid unstable buster bullseye stretch jessie bionic trusty precise xenial hirsute impish kali-rolling" run: | mkdir -p upload for release in $RELEASES; do diff --git a/script/distributions b/script/distributions index 51b4d194d..6fada64b2 100644 --- a/script/distributions +++ b/script/distributions @@ -30,6 +30,14 @@ Components: main Description: The GitHub CLI - debian unstable repo SignWith: C99B11DEB97541F0 +Origin: gh +Label: gh +Codename: sid +Architectures: i386 amd64 armhf arm64 +Components: main +Description: The GitHub CLI - debian unstable repo +SignWith: C99B11DEB97541F0 + Origin: gh Label: gh Codename: buster From 3e21da9167f45aefc12f5d5a97156c7b8db53670 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Thu, 20 May 2021 11:44:50 -0500 Subject: [PATCH 4/4] just use stable --- docs/install_linux.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/install_linux.md b/docs/install_linux.md index 25eb01b5e..edc1b0979 100644 --- a/docs/install_linux.md +++ b/docs/install_linux.md @@ -13,13 +13,15 @@ If none of our official binaries, packages, repositories, nor community sources ### Debian, Ubuntu Linux (apt) -:warning: This will only work for the deb-based distributions we [explicitly support](/.github/workflows/releases.yml#L83) and the [architectures we officially support](/.goreleaser.yml#L27). +:warning: This will only work for the [architectures we officially support](/.goreleaser.yml#L27). + +The below should work for any debian-based distribution. You can change `stable` to a specific codename [we support](/.github/workflows/releases.yml#L83) if that is your preference. Install: ```bash curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/github-cli2.list > /dev/null +echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null sudo apt update sudo apt install gh ```