From c40a4a237584ee533fbd1cdaed6f62f7f99fb067 Mon Sep 17 00:00:00 2001
From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 4 Aug 2022 14:01:14 +0100
Subject: [PATCH] Align v3.0 deb tests with master

---
 .github/workflows/ci-deb.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-deb.yml b/.github/workflows/ci-deb.yml
index 0a37bc6f8f..1bfbe507fd 100644
--- a/.github/workflows/ci-deb.yml
+++ b/.github/workflows/ci-deb.yml
@@ -30,6 +30,10 @@ jobs:
     container:
       image: ${{ matrix.env.OS }}
 
+    env:
+      HOSTAPD_BUILD_DIR: /tmp/eapol_test.ci
+      HOSTAPD_GIT_TAG: hostap_2_8
+
     name: "DEB build"
 
     steps:
@@ -57,7 +61,6 @@ jobs:
       run: |
         pwd
         ls -la
-        cp -r freeradius freeradius-tests
         mkdir debs
         ls -la
 
@@ -75,15 +78,6 @@ jobs:
         krb5-config --all || :
         openssl version
 
-    - name: Run tests and build eapol_test
-      run: |
-        apt-get install -y libnl-3-dev libnl-genl-3-dev
-        ./configure
-        make -j `nproc`
-        make test
-        mv scripts/ci/eapol_test/eapol_test ../debs/
-      working-directory: freeradius-tests
-
     - name: Build DEBs
       run: |
         make deb
@@ -93,6 +87,20 @@ jobs:
       run: |
         mv *.deb debs/
 
+    - name: Restore eapol_test build directory from cache
+      uses: actions/cache@v2
+      id: hostapd-cache
+      with:
+        path: ${{ env.HOSTAPD_BUILD_DIR }}
+        key: hostapd-${{ matrix.env.NAME }}-${{ env.HOSTAPD_GIT_TAG }}-v1
+
+    - name: Build eapol_test
+      run: |
+        apt-get install -y libnl-3-dev libnl-genl-3-dev
+        scripts/ci/eapol_test-build.sh
+        mv scripts/ci/eapol_test/eapol_test ../debs
+      working-directory: freeradius
+
     - name: Store DEBs
       uses: actions/upload-artifact@v2
       with:
-- 
2.47.3