Skip to content

Commit

Permalink
scripts/installer.sh: set Deepin to a debian version
Browse files Browse the repository at this point in the history
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 #8850
Updates #7862
Updates https://github.com/tailscale/corp/issues/8952

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
  • Loading branch information
DentonGentry committed Aug 12, 2023
1 parent 9e24a65 commit 4940a71
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions scripts/installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4940a71

Please sign in to comment.