First CI pull (#298)

* actions * name change * v1.0.7 * i386 * more * more * tweaks * rename * parameters * names * fix * fixes * fixes * fixes * more * ugh * more * ugh * more * vars * typo * branch * tweaks * python * python * python link * sync * uboot * PACKAGES * sync * rpi2 * fixes * soekris * rpi firmware * cirrus * 1 * 2 * 3 * 4 * 5 * rm * more * more * change to script * vars * more * SOEKRIS * fixes * refactor * naming * more * fix * self-hosting * update vm action * dd * cross-platform-actions * revert * blah * sudo * better * fix * http 1.1 * more * more * oops * dont update * suorce dir * refactor * more * ? * revert * tt * fix * simplification * better git handling * enable soekris * fix * fix * oops * fix * ff * gg * hh * oops * kl * sudo * ee * tt * timeout * h * jj * more * 14.1 * revert * longer runtime * jenkins * fixes * refactor * fix? * image options * more * ff * CI * fix * more * more * more * oops * more * not needed * more * attempt build * build script * larger image size, use rsync * copy logs * remove objs * larger image file, different uploads
freebsd · Jan 19, 2025 · 35cfc51 · 35cfc51
1 parent 15b8f92
commit 35cfc51
Show file tree

Hide file tree

Showing 7 changed files with 424 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,38 @@
+name: CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: CI 14.2
+    env:
+      BRANCH : releng/14.2
+      CONFIG: ci/configs/config_i386.sh
+    steps:
+    - uses: actions/checkout@v4
+    - name: CI
+      id: ci
+      uses: vmactions/freebsd-vm@v1
+      with:
+        envs: 'BRANCH CONFIG'
+        usesh: true
+        sync: rsync
+        copyback: true
+        prepare: |
+          pkg install -y sudo
+
+        run: |
+          sh ci/build_14.2_i386.sh  
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: logs
+        path: /home/runner/work/crochet-freebsd/crochet-freebsd/work/*.log
+        overwrite: true
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: image
+        path: /home/runner/work/crochet-freebsd/crochet-freebsd/work/*.img
+        overwrite: true
diff --git a/board/GenericI386/setup.sh b/board/GenericI386/setup.sh
@@ -12,7 +12,7 @@ generic_i386_partition_image ( ) {
 
 	# TODO: This is broken; should use 'make install' to copy
 	# bootfiles to workdir, then install to disk image from there.
-        BOOTFILES=${FREEBSD_OBJDIR}/stand/i386
+        BOOTFILES=${FREEBSD_OBJDIR}/i386.i386/stand/i386
         echo "Boot files are at: "${BOOTFILES} 
         gpart bootcode -b ${BOOTFILES}/mbr/mbr ${DISK_MD} || exit 1
         gpart set -a active -i 1 ${DISK_MD} || exit 1

diff --git a/board/RaspberryPi/mkimage.sh b/board/RaspberryPi/mkimage.sh
@@ -3,7 +3,7 @@
 #
 
 mkimage_python_check ( ) {
-    if python --version >/dev/null 2>&1; then
+    if python3 --version >/dev/null 2>&1; then
         true
     else
         echo "Need Python to run RaspberryPi mkimage tool"
@@ -22,12 +22,12 @@ strategy_add $PHASE_CHECK mkimage_python_check
 # $2: output
 mkimage ( ) {
     if [ ${VERBOSE} -gt 0 ]; then
-        echo "python imagetool-uncompressed.py $1 - > $2"
+        echo "python3 imagetool-uncompressed.py $1 - > $2"
     fi 
     # parens here ensure paths are interpreted relative to the
     # appropriate current directory
     (
         cd ${BOARDDIR}/mkimage
-        python imagetool-uncompressed.py $1 -
+        python3 imagetool-uncompressed.py $1 -
     ) > $2
 }
diff --git a/board/RaspberryPi/setup.sh b/board/RaspberryPi/setup.sh
@@ -1,6 +1,6 @@
 KERNCONF=RPI-B
 RPI_UBOOT_PORT="u-boot-rpi"
-RPI_UBOOT_BIN="u-boot.img"
+RPI_UBOOT_BIN="u-boot.bin"
 RPI_FIRMWARE_SRC=/usr/local/share/u-boot/${RPI_UBOOT_PORT}
 RPI_GPU_MEM=32
 IMAGE_SIZE=$((1000 * 1000 * 1000)) # 1 GB default

diff --git a/ci/build_14.2_i386.sh b/ci/build_14.2_i386.sh
@@ -0,0 +1,10 @@
+
+#!/bin/sh
+
+pwd
+sudo pkg install -y git
+sudo git clone -b releng/14.2 https://git.freebsd.org/src.git /usr/src
+ls -lat /usr/src
+sh crochet.sh -c ci/configs/config_i386.sh
+rm -rf work/obj
+