Skip to content

Commit 35cfc51

Browse files
authored
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
1 parent 15b8f92 commit 35cfc51

File tree

7 files changed

+424
-6
lines changed

7 files changed

+424
-6
lines changed

.github/workflows/main.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CI
2+
3+
on: [push]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
name: CI 14.2
9+
env:
10+
BRANCH : releng/14.2
11+
CONFIG: ci/configs/config_i386.sh
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: CI
15+
id: ci
16+
uses: vmactions/freebsd-vm@v1
17+
with:
18+
envs: 'BRANCH CONFIG'
19+
usesh: true
20+
sync: rsync
21+
copyback: true
22+
prepare: |
23+
pkg install -y sudo
24+
25+
run: |
26+
sh ci/build_14.2_i386.sh
27+
28+
- uses: actions/upload-artifact@v4
29+
with:
30+
name: logs
31+
path: /home/runner/work/crochet-freebsd/crochet-freebsd/work/*.log
32+
overwrite: true
33+
34+
- uses: actions/upload-artifact@v4
35+
with:
36+
name: image
37+
path: /home/runner/work/crochet-freebsd/crochet-freebsd/work/*.img
38+
overwrite: true

board/GenericI386/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ generic_i386_partition_image ( ) {
1212

1313
# TODO: This is broken; should use 'make install' to copy
1414
# bootfiles to workdir, then install to disk image from there.
15-
BOOTFILES=${FREEBSD_OBJDIR}/stand/i386
15+
BOOTFILES=${FREEBSD_OBJDIR}/i386.i386/stand/i386
1616
echo "Boot files are at: "${BOOTFILES}
1717
gpart bootcode -b ${BOOTFILES}/mbr/mbr ${DISK_MD} || exit 1
1818
gpart set -a active -i 1 ${DISK_MD} || exit 1

board/RaspberryPi/mkimage.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
mkimage_python_check ( ) {
6-
if python --version >/dev/null 2>&1; then
6+
if python3 --version >/dev/null 2>&1; then
77
true
88
else
99
echo "Need Python to run RaspberryPi mkimage tool"
@@ -22,12 +22,12 @@ strategy_add $PHASE_CHECK mkimage_python_check
2222
# $2: output
2323
mkimage ( ) {
2424
if [ ${VERBOSE} -gt 0 ]; then
25-
echo "python imagetool-uncompressed.py $1 - > $2"
25+
echo "python3 imagetool-uncompressed.py $1 - > $2"
2626
fi
2727
# parens here ensure paths are interpreted relative to the
2828
# appropriate current directory
2929
(
3030
cd ${BOARDDIR}/mkimage
31-
python imagetool-uncompressed.py $1 -
31+
python3 imagetool-uncompressed.py $1 -
3232
) > $2
3333
}

board/RaspberryPi/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
KERNCONF=RPI-B
22
RPI_UBOOT_PORT="u-boot-rpi"
3-
RPI_UBOOT_BIN="u-boot.img"
3+
RPI_UBOOT_BIN="u-boot.bin"
44
RPI_FIRMWARE_SRC=/usr/local/share/u-boot/${RPI_UBOOT_PORT}
55
RPI_GPU_MEM=32
66
IMAGE_SIZE=$((1000 * 1000 * 1000)) # 1 GB default

ci/build_14.2_i386.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
#!/bin/sh
3+
4+
pwd
5+
sudo pkg install -y git
6+
sudo git clone -b releng/14.2 https://git.freebsd.org/src.git /usr/src
7+
ls -lat /usr/src
8+
sh crochet.sh -c ci/configs/config_i386.sh
9+
rm -rf work/obj
10+

0 commit comments

Comments
 (0)