From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Mon, 11 Oct 2021 14:49:37 +0000 (+0100)
Subject: CI: install nr-extras on all debian builds
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb98e291c357b754b04c74fc569f725b0199966;p=thirdparty%2Ffreeradius-server.git

CI: install nr-extras on all debian builds

kqueue in sid is now too old
---

diff --git a/.github/workflows/ci-deb.yml b/.github/workflows/ci-deb.yml
index bccb2ee4734..bf6967d03f6 100644
--- a/.github/workflows/ci-deb.yml
+++ b/.github/workflows/ci-deb.yml
@@ -31,11 +31,11 @@ jobs:
           M=$(cat <<EOF
           {
             "env": [
-              { "NAME": "ubuntu-18.04", "OS": "ubuntu:18.04",    "NR_EXTRAS": "1" },
-              { "NAME": "ubuntu-20.04", "OS": "ubuntu:20.04",    "NR_EXTRAS": "1" },
-              { "NAME": "debian-10",    "OS": "debian:buster",   "NR_EXTRAS": "1" },
-              { "NAME": "debian-11",    "OS": "debian:bullseye", "NR_EXTRAS": "1" },
-              { "NAME": "debian-sid",   "OS": "debian:sid",      "NR_EXTRAS": ""  }
+              { "NAME": "ubuntu-18.04", "OS": "ubuntu:18.04"    },
+              { "NAME": "ubuntu-20.04", "OS": "ubuntu:20.04"    },
+              { "NAME": "debian-10",    "OS": "debian:buster"   },
+              { "NAME": "debian-11",    "OS": "debian:bullseye" },
+              { "NAME": "debian-sid",   "OS": "debian:sid"      }
             ]
           }
         EOF
@@ -44,7 +44,7 @@ jobs:
           M=$(cat <<EOF
           {
             "env": [
-              { "NAME": "debian-11",    "OS": "debian:bullseye", "NR_EXTRAS": "1" },
+              { "NAME": "debian-11",    "OS": "debian:bullseye" }
             ]
           }
         EOF
@@ -99,7 +99,6 @@ jobs:
       run: curl -sS https://packages.networkradius.com/pgp/packages%40networkradius.com | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=yes apt-key add -
 
     - name: Set up NetworkRADIUS extras repository
-      if: ${{ matrix.env.NR_EXTRAS == '1' }}
       run: |
         DIST=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
         RELEASE=$(lsb_release -cs)
@@ -217,7 +216,6 @@ jobs:
       run: curl -sS https://packages.networkradius.com/pgp/packages%40networkradius.com | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=yes apt-key add -
 
     - name: Set up NetworkRADIUS extras repository
-      if: ${{ matrix.env.NR_EXTRAS == '1' }}
       run: |
         DIST=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
         RELEASE=$(lsb_release -cs)