ci: updates

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

Author: RobertCNelson

.gitlab-ci.yml

@@ -27,14 +27,13 @@ build-debian-14-arm64:
     - df -h /dev/shm
     - ccache -M 1G
     - ccache -sv
-    - ccache --recompress=uncompressed
     - ccache -z
     - ./build_u-boot.sh
     - ccache -sv
     - df -h /dev/shm
-    - tar --use-compress-program='zstd -9' -cf ccache.tar.zst /dev/shm/my-ccache-in-memory
+    - tar --use-compress-program='zstd -6' -cf ccache.tar.zst /dev/shm/my-ccache-in-memory
 
-build-debian-13-arm64:
+pages:
   image: robertcnelson/beagle-devscripts-kernel-debian-13-arm64:latest
   # https://openbeagle.org/beagleboard/ci-docker-images
   cache:
@@ -49,34 +48,11 @@ build-debian-13-arm64:
     - df -h /dev/shm
     - ccache -M 1G
     - ccache -sv
-    - ccache --recompress=uncompressed
-    - ccache -z
-    - ./build_u-boot.sh
-    - ccache -sv
-    - df -h /dev/shm
-    - tar --use-compress-program='zstd -9' -cf ccache.tar.zst /dev/shm/my-ccache-in-memory
-
-pages:
-  image: robertcnelson/beagle-devscripts-kernel-debian-12-arm64:latest
-  # https://openbeagle.org/beagleboard/ci-docker-images
-  cache:
-    key: "$CI_PROJECT_NAME-debian-12-arm64"
-    paths:
-      - ccache.tar.zst
-  tags:
-    - docker-aarch64-rpi4-ci
-  stage: build
-  script:
-    - tar --zstd -xf ccache.tar.zst -C / || true
-    - df -h /dev/shm
-    - ccache -M 1G
-    - ccache -sv
-    - ccache --recompress=uncompressed
     - ccache -z
     - ./build_u-boot.sh
     - ccache -sv
     - df -h /dev/shm
-    - tar --use-compress-program='zstd -9' -cf ccache.tar.zst /dev/shm/my-ccache-in-memory
+    - tar --use-compress-program='zstd -6' -cf ccache.tar.zst /dev/shm/my-ccache-in-memory
     - apindex public
   artifacts:
     when: on_success

scripts/pull.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+git pull --no-edit https://github.com/beagleboard/u-boot-beagley-ai.git main

scripts/push-tag.sh

@@ -5,7 +5,7 @@ wfile=$(mktemp /tmp/builder.XXXXXXXXX)
 . version.sh
 
 echo "****************************************************"
-echo [${UBOOT}:${TRUSTED_FIRMWARE}:${OPTEE}:${TI_FIRMWARE}]
+echo [${UBOOT}:${TFA}:${OPTEE}:${TI_FIRMWARE}]
 echo "****************************************************"
 
 cp public/base.sh public/get_n_install.sh

version.sh

@@ -5,11 +5,11 @@ TI_FIRMWARE="${TI_FIRMWARE:-11.02.11}"
 
 #https://github.com/TrustedFirmware-A/trusted-firmware-a.git
 TFA_GIT="${TFA_GIT:-https://github.com/TrustedFirmware-A/trusted-firmware-a.git}"
-#TFA="lts-v2.12.8"
-TFA="v2.14.0"
+#TFA="${TFA:-lts-v2.12.8}"
+TFA="${TFA:-v2.14.0}"
 
 #https://github.com/OP-TEE/optee_os.git
-OPTEE="4.9.0-rc1"
+OPTEE="${OPTEE:-4.9.0-rc1}"
 
 #https://github.com/beagleboard/u-boot.git
 UBOOT_GIT="${UBOOT_GIT:-https://github.com/beagleboard/u-boot.git}"