From 0f2d220b7e9332a84a5f9d2b7e7da8e3cd5cc0a0 Mon Sep 17 00:00:00 2001
From: Pavel Abramov <31950564+uncleDecart@users.noreply.github.com>
Date: Tue, 18 Jun 2024 11:36:41 +0200
Subject: [PATCH] Revert "GitHub Actions: build.yml: add platform parameter"

---
 .github/workflows/build.yml         | 32 ++++++++---------------------
 .github/workflows/buildondemand.yml | 16 +--------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a01745341d..04008e815c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,24 +77,9 @@ jobs:
       matrix:
         arch: [arm64, amd64]
         hv: [xen, kvm]
-        platform: ["generic"]
         include:
           - arch: riscv64
             hv: mini
-            platform: "generic"
-          - arch: amd64
-            hv: kvm
-            platform: "rt"
-          - arch: arm64
-            hv: kvm
-            platform: "nvidia"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_pollux"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_epc_r3720"
-
     steps:
       - uses: actions/checkout@v4
         with:
@@ -137,9 +122,9 @@ jobs:
           echo "TAG=evebuild/pr:$PR_ID" >> $GITHUB_ENV
           echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV"
 
-      - name: Build EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
+      - name: Build EVE ${{ matrix.hv }}-${{ matrix.arch }}
         run: |
-          make V=1 ROOTFS_VERSION="$VERSION" PLATFORM=${{ matrix.platform }} HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} pkgs eve  # note that this already loads it into docker
+          make V=1 ROOTFS_VERSION="$VERSION" HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} pkgs eve  # note that this already loads it into docker
       - name: Post eve build report
         run: |
           echo Disk usage
@@ -150,18 +135,17 @@ jobs:
           docker system df -v
       - name: Export docker container
         run: |
-          make cache-export ZARCH=${{ matrix.arch }} IMAGE=lfedge/eve:$VERSION-${{ matrix.hv }} OUTFILE=eve-${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}.tar IMAGE_NAME=$TAG-${{ matrix.hv }}-${{ matrix.arch }}
-      - name: Upload EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
+          make cache-export ZARCH=${{ matrix.arch }} IMAGE=lfedge/eve:$VERSION-${{ matrix.hv }} OUTFILE=eve-${{ matrix.hv }}-${{ matrix.arch }}.tar IMAGE_NAME=$TAG-${{ matrix.hv }}-${{ matrix.arch }}
+      - name: Upload EVE ${{ matrix.hv }}-${{ matrix.arch }}
         uses: actions/upload-artifact@v4
         with:
-          name: eve-${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
-          path: eve-${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}.tar
-      - name: Clean EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
+          name: eve-${{ matrix.hv }}-${{ matrix.arch }}
+          path: eve-${{ matrix.hv }}-${{ matrix.arch }}.tar
+      - name: Clean EVE ${{ matrix.hv }}-${{ matrix.arch }}
         run: |
           make clean
           docker rmi "$TAG-${{ matrix.hv }}-${{ matrix.arch }}" "lfedge/eve:$VERSION-${{ matrix.hv }}" "lfedge/eve:$VERSION-${{ matrix.hv }}-${{ matrix.arch }}" ||:
-      - name: Post clean eve ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
-report
+      - name: Post clean eve ${{ matrix.hv }}-${{ matrix.arch }} report
         run: |
           echo Disk usage
           df -h
diff --git a/.github/workflows/buildondemand.yml b/.github/workflows/buildondemand.yml
index 2aef2b8235..93595313fc 100644
--- a/.github/workflows/buildondemand.yml
+++ b/.github/workflows/buildondemand.yml
@@ -89,23 +89,9 @@ jobs:
       matrix:
         arch: [arm64, amd64]
         hv: [xen, kvm]
-        platform: ["generic"]
         include:
           - arch: riscv64
             hv: mini
-            platform: "generic"
-          - arch: amd64
-            hv: kvm
-            platform: "rt"
-          - arch: arm64
-            hv: kvm
-            platform: "nvidia"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_pollux"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_epc_r3720"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -121,7 +107,7 @@ jobs:
 
       - uses: ./.github/actions/run-make
         with:
-          command: "V=1 HV=${{ matrix.hv }} PLATFORM=${{ matrix.platform }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push $FORCE_BUILD eve"
+          command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push $FORCE_BUILD eve"
           dockerhub-token: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }}
           dockerhub-account: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }}
       - uses: ./.github/actions/run-make