TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/installer.sh: set Deepin to a debian version

Browse Source 
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 <dgentry@tailscale.com>
This commit is contained in:
Denton Gentry 2023-08-12 07:16:27 -07:00 committed by Denton Gentry
parent 9e24a6508a
commit 4940a718a1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/installer.yml vendored
View File

@ -78,7 +78,7 @@ jobs:
|| contains(matrix.image, 'amazonlinux') || contains(matrix.image, 'amazonlinux')
- name: install dependencies (zypper) - name: install dependencies (zypper)
# tar and gzip are needed by the actions/checkout below. # 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') if: contains(matrix.image, 'opensuse')
- name: install dependencies (apt-get) - name: install dependencies (apt-get)
run: | run: |

2
scripts/installer.sh
View File

@ -159,8 +159,10 @@ main() {
PACKAGETYPE="apt" PACKAGETYPE="apt"
if [ "$VERSION_ID" -lt 20 ]; then if [ "$VERSION_ID" -lt 20 ]; then
APT_KEY_TYPE="legacy" APT_KEY_TYPE="legacy"
VERSION="buster"
else else
APT_KEY_TYPE="keyring" APT_KEY_TYPE="keyring"
VERSION="bullseye"
fi fi
;; ;;
centos) centos)