Merge pull request #1 from uncleDecart/gha-add-platform

GitHub Actions: build.yml: add platform parameter
uncleDecart · Jun 18, 2024 · e285987 · e285987
2 parents 8ab085d + 10a05b0
commit e285987
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -77,9 +77,24 @@ 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:
@@ -122,9 +137,9 @@ jobs:
           echo "TAG=evebuild/pr:$PR_ID" >> $GITHUB_ENV
           echo "ARCH=${{ matrix.arch }}" >> "$GITHUB_ENV"
 
-      - name: Build EVE ${{ matrix.hv }}-${{ matrix.arch }}
+      - name: Build EVE ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
         run: |
-          make V=1 ROOTFS_VERSION="$VERSION" HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} pkgs eve  # note that this already loads it into docker
+          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
       - name: Post eve build report
         run: |
           echo Disk usage
@@ -135,17 +150,18 @@ 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 }}.tar IMAGE_NAME=$TAG-${{ matrix.hv }}-${{ matrix.arch }}
-      - name: Upload EVE ${{ matrix.hv }}-${{ matrix.arch }}
+          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 }}
         uses: actions/upload-artifact@v4
         with:
-          name: eve-${{ matrix.hv }}-${{ matrix.arch }}
-          path: eve-${{ matrix.hv }}-${{ matrix.arch }}.tar
-      - name: Clean EVE ${{ matrix.hv }}-${{ matrix.arch }}
+          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 }}
         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 }} report
+      - name: Post clean eve ${{ matrix.hv }}-${{ matrix.arch }}-${{ matrix.platform }}
+report
         run: |
           echo Disk usage
           df -h

diff --git a/.github/workflows/buildondemand.yml b/.github/workflows/buildondemand.yml
@@ -89,9 +89,23 @@ 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:
@@ -107,7 +121,7 @@ jobs:
 
       - uses: ./.github/actions/run-make
         with:
-          command: "V=1 HV=${{ matrix.hv }} ZARCH=${{ matrix.arch }} LINUXKIT_PKG_TARGET=push $FORCE_BUILD eve"
+          command: "V=1 HV=${{ matrix.hv }} PLATFORM=${{ matrix.platform }} 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