From 6e608e0b6e173b52395edd95ed6cb54c71cab3f8 Mon Sep 17 00:00:00 2001
From: moabu <47318409+moabu@users.noreply.github.com>
Date: Wed, 22 Jan 2025 18:41:58 +0300
Subject: [PATCH] ci: fix CC var

Signed-off-by: moabu <47318409+moabu@users.noreply.github.com>
---
 .github/workflows/build-packages.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index ff5d8d55c93..7a3c2d67246 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -474,6 +474,10 @@ jobs:
         KRAKEND_BUILDER_IMAGE=${{ matrix.krakend-builder-image }}
         KRAKEND_BUILDER_IMAGE=${KRAKEND_BUILDER_IMAGE/:/-}
         echo KRAKEND_BUILDER_IMAGE=${KRAKEND_BUILDER_IMAGE} >> $GITHUB_ENV
+        CC="aarch64-linux-musl-gcc" >> $GITHUB_ENV
+        if [ "${{ matrix.krakend-builder-image }}" == "builder:2.9.0-linux-generic" ]; then
+          CC="aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+        fi
     - name: Build plugin for AMD64 
       working-directory: ${{ github.workspace }}/jans-cedarling/cedarling-krakend
       run: |
@@ -481,11 +485,8 @@ jobs:
     - name: Build plugin for ARM64
       working-directory: ${{ github.workspace }}/jans-cedarling/cedarling-krakend
       run: |
-        CC="aarch64-linux-musl-gcc"
-        if [ "${{ matrix.krakend-builder-image }}" == "builder:2.9.0-linux-generic" ]; then
-          CC="aarch64-linux-gnu-gcc"
-        fi
-        docker run -i -v "$PWD:/app" -w /app -e "CGO_ENABLED=1" -e "CC=$CC" -e "GOARCH=arm64" -e "GOHOSTARCH=amd64" krakend/"${{ matrix.krakend-builder-image }}" go build -ldflags='-extldflags=-fuse-ld=bfd -extld=$CC' -buildmode=plugin -o  cedarling-krakend-arm64-"${{ env.KRAKEND_BUILDER_IMAGE }}"-"${{ env.TAG }}".so .
+
+        docker run -i -v "$PWD:/app" -w /app -e "CGO_ENABLED=1" -e "CC=${{ env.CC }}" -e "GOARCH=arm64" -e "GOHOSTARCH=amd64" krakend/"${{ matrix.krakend-builder-image }}" go build -ldflags='-extldflags=-fuse-ld=bfd -extld=${{ env.CC }}' -buildmode=plugin -o  cedarling-krakend-arm64-"${{ env.KRAKEND_BUILDER_IMAGE }}"-"${{ env.TAG }}".so .
     - name: Generate sha256sum and sign
       working-directory: ${{ github.workspace }}/jans-cedarling/cedarling-krakend
       run: |