From 80174a04548719fa0b954961032c22314ebb7ad4 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Wed, 4 Oct 2023 10:27:30 -0700 Subject: [PATCH] docs: add ubuntu 22 arm download and pave way for debian 12 version refs: https://github.com/wez/wezterm/issues/4134 --- .cirrus.yml | 35 +++++++++++++++++++++++++++++++++++ ci/subst-release-info.py | 2 ++ docs/install/linux.md | 14 +++++++------- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 121aa95cc..43d310e51 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -71,3 +71,38 @@ task: - "./ci/deploy.sh" - "ls -l *.deb" - "bash ci/retry.sh gh release upload --clobber ${RELEASE} *.deb" + +task: + name: debian-12-arm + only_if: "$CIRRUS_REPO_OWNER == 'wez' && changesInclude('**.toml', '**.rs', '.gitmodules', '.cirrus.yml', 'get-deps', 'Cargo.lock')" + arm_container: + image: debian:12 + cpu: 4 + memory: 12G + environment: + GITHUB_TOKEN: ENCRYPTED[23bd9513fa7174e74eaddce6a3099cabb22118423591553b23518e8c34bf155e07c559838b1d3422f561c73c1e31e6fc] + + stateful: false + install_rust_script: + - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections + - apt update + - apt-get install -y git curl + - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + install_gh_cli_script: + - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg > /usr/share/keyrings/githubcli-archive-keyring.gpg + - chmod go+r /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 stable main" > /etc/apt/sources.list.d/github-cli.list + - apt update + - apt install gh -y + - gh --version + getdeps_script: + - env PATH=$HOME/.cargo/bin:$PATH bash get-deps + build_script: + - env PATH=$HOME/.cargo/bin:$PATH cargo build --release -p wezterm-gui -p wezterm -p wezterm-mux-server -p strip-ansi-escapes + - export BUILD_REASON="Schedule" + - export RELEASE="nightly" + - "test -n \"$CIRRUS_TAG\" && BUILD_REASON=\"tag\"" + - "test -n \"$CIRRUS_TAG\" && RELEASE=$(ci/tag-name.sh)" + - "./ci/deploy.sh" + - "ls -l *.deb" + - "bash ci/retry.sh gh release upload --clobber ${RELEASE} *.deb" diff --git a/ci/subst-release-info.py b/ci/subst-release-info.py index 2e278b6ac..7602adb65 100755 --- a/ci/subst-release-info.py +++ b/ci/subst-release-info.py @@ -13,6 +13,8 @@ CATEGORIZE = { r"Debian(\d+)(\.\d+)?\.deb$": "debian\\1_deb", r"Ubuntu(\d+)(\.\d+)?.AppImage$": "ubuntu\\1_AppImage", r"Ubuntu(\d+)(\.\d+)?.deb$": "ubuntu\\1_deb", + r"Ubuntu(\d+)(\.\d+)?\.arm64\.deb$": "ubuntu\\1_arm64_deb", + r"Debian(\d+)(\.\d+)?\.arm64\.deb$": "debian\\1_arm64_deb", r"Ubuntu20.04.tar.xz$": "linux_raw_bin", r"^wezterm-\d+-\d+-[a-f0-9]+.tar.xz$": "linux_raw_bin", r"src.tar.gz$": "src", diff --git a/docs/install/linux.md b/docs/install/linux.md index e95775e87..6d489017f 100644 --- a/docs/install/linux.md +++ b/docs/install/linux.md @@ -87,13 +87,13 @@ that exactly matches your system you can try installing one from an older versio of your distribution, or use one of the Debian packages linked below. Failing that, you can try the AppImage download which should work on most Linux systems. -|Distro | Stable | Nightly | -|------------|------------------|---------------------| -|Ubuntu20 |[{{ ubuntu20_deb_stable_asset }}]({{ ubuntu20_deb_stable }}) |[{{ ubuntu20_deb_nightly_asset }}]({{ ubuntu20_deb_nightly }})| -|Ubuntu22 |[{{ ubuntu22_deb_stable_asset }}]({{ ubuntu22_deb_stable }}) |[{{ ubuntu22_deb_nightly_asset }}]({{ ubuntu22_deb_nightly }})| -|Debian10 |[{{ debian10_deb_stable_asset }}]({{ debian10_deb_stable }}) |[{{ debian10_deb_nightly_asset }}]({{ debian10_deb_nightly }})| -|Debian11 |[{{ debian11_deb_stable_asset }}]({{ debian11_deb_stable }}) |[{{ debian11_deb_nightly_asset }}]({{ debian11_deb_nightly }})| -|Debian12 |Nightly builds only|[{{ debian12_deb_nightly_asset }}]({{ debian12_deb_nightly }})| +|Distro | Stable | Nightly| | +|------------|------------------|--------|------------| +|Ubuntu20 |[amd64]({{ ubuntu20_deb_stable }}) |[amd64]({{ ubuntu20_deb_nightly }})| | +|Ubuntu22 |[amd64]({{ ubuntu22_deb_stable }}) |[amd64]({{ ubuntu22_deb_nightly }})|[arm64]({{ ubuntu22_arm64_deb_nightly}})| +|Debian10 |[amd64]({{ debian10_deb_stable }}) |[amd64]({{ debian10_deb_nightly }})| | +|Debian11 |[amd64]({{ debian11_deb_stable }}) |[amd64]({{ debian11_deb_nightly }})| | +|Debian12 |Nightly builds only|[amd64]({{ debian12_deb_nightly }})| | To download and install from the CLI, you can use something like this, which shows how to install the Ubuntu 20 package: