From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 29 Aug 2024 15:48:21 +0000 (+0100)
Subject: Add platform to hostapd-cache key
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d99f60e3c0dee0c10b95e1170da871619918c4ae;p=thirdparty%2Ffreeradius-server.git

Add platform to hostapd-cache key

When building FreeRADIUS in a docker container, runner.os is the host
platform - so does not change to reflect the docker image the build is
running in.
---

diff --git a/.github/actions/build-freeradius/action.yml b/.github/actions/build-freeradius/action.yml
index 24ef474ec9f..9eb0eed987f 100644
--- a/.github/actions/build-freeradius/action.yml
+++ b/.github/actions/build-freeradius/action.yml
@@ -10,6 +10,8 @@ inputs:
   test_type:
     desription: What test is being run
     default: gcc
+  platform:
+    description: Platform the build is on
 
 
 runs:
@@ -40,7 +42,7 @@ runs:
       id: hostapd-cache
       with:
         path: ${{ env.HOSTAPD_BUILD_DIR }}
-        key: hostapd-${{ runner.os }}-${{ env.HOSTAPD_GIT_TAG }}-v4
+        key: hostapd-${{ runner.os }}-${{ inputs.platform }}-${{ env.HOSTAPD_GIT_TAG }}-v4
       if: ${{ inputs.test_type != 'fuzzing' }}
 
     #  Has issues in Docker container when running on GitHub...
diff --git a/.github/workflows/ci-sanitizers.yml b/.github/workflows/ci-sanitizers.yml
index a666fffb677..aee1ab93a4b 100644
--- a/.github/workflows/ci-sanitizers.yml
+++ b/.github/workflows/ci-sanitizers.yml
@@ -96,6 +96,7 @@ jobs:
           use_sanitizers: true
           cc: ${{ matrix.env.CC }}
           test_type: ${{ matrix.env.TEST_TYPE }}
+          platform: ${{ matrix.os.imageos }}
 
       - name: Run main CI tests
         uses: ./.github/actions/ci-tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b80da5e2314..1627c510790 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -168,6 +168,7 @@ jobs:
           use_sanitizers: false
           cc: ${{ matrix.env.CC }}
           test_type: ${{ matrix.env.TEST_TYPE }}
+          platform: ${{ matrix.os.imageos }}
 
       - name: Run main CI tests
         uses: ./.github/actions/ci-tests