From 8d374d477902201329e560e433ea4788bbe86a3a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 14 Apr 2025 13:35:56 -0500
Subject: [PATCH] ci: build both debian-13 and ubuntu 2404 images

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 .gitlab-ci.yml | 65 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 051c0df..961204c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,29 +1,64 @@
-image: robertcnelson/beagle-devscripts-kernel-debian-12-amd64:latest
-# https://openbeagle.org/beagleboard/ci-docker-images
-
 before_script:
   - export PATH=/usr/lib/ccache:$PATH
   - echo "Acquire::http::Proxy \"http://192.168.1.10:3142\";" > /etc/apt/apt.conf.d/00aptproxy
   - apt-get update
-  - apt-get upgrade -yq
   - apt-get dist-upgrade -yq
   - apt-get install -yq bc bison bmap-tools cpio debhelper dosfstools flex genimage kmod libelf-dev libssl-dev libyaml-dev lz4 mtools
 
-variables:
-  FF_USE_FASTZIP: "true"
-  CACHE_COMPRESSION_LEVEL: "fast"
-
-cache:
-  key: "$CI_PROJECT_NAME-v6.1.x-Beagle"
-  paths:
-    - mirror/x86_64-gcc-*-linux.tar.xz
-    - ccache.tar.lz4
+build-v6.1-debian-13-riscv64:
+  image: robertcnelson/beagle-devscripts-kernel-debian-12-amd64:latest
+  # https://openbeagle.org/beagleboard/ci-docker-images
+  cache:
+    key: "$CI_PROJECT_NAME-v6.6-debian-13-riscv64"
+    paths:
+      - mirror/x86_64-gcc-*-linux.tar.xz
+      - ccache.tar.lz4
+  tags:
+    - docker-amd64
+  stage: build
+  script:
+    - git config --global user.email "$GITLAB_USER_EMAIL"
+    - git config --global user.name "$GITLAB_USER_NAME"
+    - touch .gitlab-runner
+    - ./01_git_sync.sh
+    - ./02_build_hss.sh
+    - ./03_build_u-boot.sh
+    - mkdir -p /root/.cache/ccache/ || true
+    - tar --use-compress-program=lz4 -xf ccache.tar.lz4 -C / || true
+    - ccache -M 1G
+    - ccache -z
+    - ./04_build_linux.sh
+    - ccache -sv
+    - tar --use-compress-program=lz4 -cf ccache.tar.lz4 /root/.cache/ccache/
+    - ./05_generate_payload.bin.sh
+    - ./06_generate_debian_console_root.sh
+    - ./07_create_sdcard_img.sh
+    - xz -vT8 deploy/images/sdcard.img
+    - tree -s deploy/
+    - cp -v deploy/images/sdcard.img.xz ./deploy/
+    - cp -v deploy/images/sdcard.bmap ./deploy/
+  artifacts:
+    expire_in: 28 days
+    name: "$CI_PROJECT_NAME-v6.1-debian-13-riscv64-$CI_JOB_ID"
+    paths:
+      - "deploy/sdcard.img.xz"
+      - "deploy/sdcard.bmap"
+      - "deploy/readme.md"
 
-build:
+build-v6.1-ubuntu-2404-riscv64:
+  image: robertcnelson/beagle-devscripts-kernel-debian-12-amd64:latest
+  # https://openbeagle.org/beagleboard/ci-docker-images
+  cache:
+    key: "$CI_PROJECT_NAME-v6.6-ubuntu-2404-riscv64"
+    paths:
+      - mirror/x86_64-gcc-*-linux.tar.xz
+      - ccache.tar.lz4
   tags:
     - docker-amd64
   stage: build
   script:
+    - git config --global user.email "$GITLAB_USER_EMAIL"
+    - git config --global user.name "$GITLAB_USER_NAME"
     - touch .gitlab-runner
     - ./01_git_sync.sh
     - ./02_build_hss.sh
@@ -44,7 +79,7 @@ build:
     - cp -v deploy/images/sdcard.bmap ./deploy/
   artifacts:
     expire_in: 28 days
-    name: "$CI_PROJECT_NAME-v6.1.x-Beagle-$CI_JOB_ID"
+    name: "$CI_PROJECT_NAME-v6.1-ubuntu-2404-riscv64-$CI_JOB_ID"
     paths:
       - "deploy/sdcard.img.xz"
       - "deploy/sdcard.bmap"