From 4940a718a1dd52a460da218c0af22412706c1672 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Sat, 12 Aug 2023 07:16:27 -0700 Subject: [PATCH] scripts/installer.sh: set Deepin to a debian version Deepin Linux 20.x reports its version as "apricot" Set it to bullseye, the Debian version it corresponds to. Also fix the installer CI: OpenSUSE Leap appears to have removed curl from the base image recently, we have to install it now. Fixes https://github.com/tailscale/tailscale/issues/8850 Updates https://github.com/tailscale/tailscale/issues/7862 Updates https://github.com/tailscale/corp/issues/8952 Signed-off-by: Denton Gentry --- .github/workflows/installer.yml | 2 +- scripts/installer.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index bcd70381c..235cfd393 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -78,7 +78,7 @@ jobs: || contains(matrix.image, 'amazonlinux') - name: install dependencies (zypper) # tar and gzip are needed by the actions/checkout below. - run: zypper --non-interactive install tar gzip + run: zypper --non-interactive install tar gzip ${{ matrix.deps }} if: contains(matrix.image, 'opensuse') - name: install dependencies (apt-get) run: | diff --git a/scripts/installer.sh b/scripts/installer.sh index fd125e5eb..db5af967b 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -159,8 +159,10 @@ main() { PACKAGETYPE="apt" if [ "$VERSION_ID" -lt 20 ]; then APT_KEY_TYPE="legacy" + VERSION="buster" else APT_KEY_TYPE="keyring" + VERSION="bullseye" fi ;; centos)