From: Adrien RICCIARDI <RICCIARDI-Adrien@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:01:06 +0000 (+0200)
Subject: CI: Updated the Buildroot image to support the RISC-V architecture. (#482)
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=c7cf25569a3e8495f5619abc4e81f4ac4662cfdd;p=ppp.git

CI: Updated the Buildroot image to support the RISC-V architecture. (#482)

Signed-off-by: RICCIARDI-Adrien <adrien.ricciardi@hotmail.fr>
---

diff --git a/.github/workflows/buildroot.yaml b/.github/workflows/buildroot.yaml
index a131f94..4353069 100644
--- a/.github/workflows/buildroot.yaml
+++ b/.github/workflows/buildroot.yaml
@@ -4,21 +4,33 @@ on: [push, pull_request]
 jobs:
   buildroot:
     name: Buildroot
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        defconfig_name: [qemu_x86_defconfig, qemu_x86_64_defconfig, raspberrypi4_defconfig, raspberrypi4_64_defconfig, qemu_ppc64le_pseries_defconfig, qemu_mips32r2_malta_defconfig, qemu_mips64_malta_defconfig]
-        libc_name: [glibc, uclibc, musl]
+        defconfig_name:
+          - qemu_x86_defconfig
+          - qemu_x86_64_defconfig
+          - raspberrypi4_defconfig
+          - raspberrypi4_64_defconfig
+          - qemu_ppc64le_pseries_defconfig
+          - qemu_mips32r2_malta_defconfig
+          - qemu_mips64_malta_defconfig
+          - qemu_riscv32_virt_defconfig
+          - qemu_riscv64_virt_defconfig
+        libc_name:
+          - glibc
+          - uclibc
+          - musl
     env:
-      PPP_CI_VERSION: v1.0
+      CI_VERSION: v1.1
       BUILDROOT_DIRECTORY_NAME: buildroot-${{ matrix.defconfig_name }}-${{ matrix.libc_name }}
     steps:
-      - name: Retrieve prebuilt Buildroot image...
+      - name: Retrieve the prebuilt Buildroot image
         working-directory: /home/runner
         run: |
-          wget https://github.com/ppp-project/ppp-ci/releases/download/${{ env.PPP_CI_VERSION }}/${{ env.BUILDROOT_DIRECTORY_NAME }}.tar.zst
-          tar -xf ${{ env.BUILDROOT_DIRECTORY_NAME }}.tar.zst
-      - name: Select latest PPP upstream version
+          wget https://github.com/ppp-project/ppp-ci/releases/download/${{ env.CI_VERSION }}/${{ env.BUILDROOT_DIRECTORY_NAME }}.tar.zst
+          tar --zstd --strip-components=2 -xf ${{ env.BUILDROOT_DIRECTORY_NAME }}.tar.zst
+      - name: Select the latest PPP upstream version
         working-directory: /home/runner/${{ env.BUILDROOT_DIRECTORY_NAME }}/package/pppd
         run: |
           # Get package sources from head of current branch