From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 27 Jun 2023 11:28:26 +0000 (+0100)
Subject: Remove package conflicts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d628b0a88ded18a160c3821d719df95230d10b;p=thirdparty%2Ffreeradius-server.git

Remove package conflicts
---

diff --git a/.github/actions/build-freeradius/action.yml b/.github/actions/build-freeradius/action.yml
index d3f8fdb3964..c1fdbf7f6ef 100644
--- a/.github/actions/build-freeradius/action.yml
+++ b/.github/actions/build-freeradius/action.yml
@@ -78,6 +78,13 @@ runs:
         sudo /bin/sh -c "echo \"deb http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main\" \
           > /etc/apt/sources.list.d/networkradius-extras.list"
 
+    #  Currently GitHub runners have a conflicting version of libhashkit2 installed which breaks dependency installation
+    - name: Remove package conflicts
+      if: ${{ runner.os != 'macOS' }}
+      shell: bash
+      run: |
+        sudo apt-get remove -y libhashkit2
+
     - name: Install build dependencies based on Debian packages plus extra CI packages
       if: ${{ runner.os != 'macOS' }}
       shell: bash