diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index d0deeb99..ec7a5f9b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -70,6 +70,25 @@ jobs: run: | make test-spec + # rootfs.squashfs is still present here; it is stripped from the + # tarball below. mkimage pulls the rpi64 bootloader from the + # latest-boot release and uses the freshly built host genimage. + - name: Build Raspberry Pi image + if: matrix.target == 'aarch64' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./utils/mkimage.sh -d -r output raspberrypi-rpi64 + mkdir -p rpi-image + mv output/images/*-rpi64-sdcard.img rpi-image/ + xz -T0 rpi-image/*-rpi64-sdcard.img + + - uses: actions/upload-artifact@v7 + if: matrix.target == 'aarch64' + with: + name: artifact-rpi64-image + path: rpi-image/*.img.xz + - name: Prepare Artifacts run: | cd output/ @@ -98,3 +117,8 @@ jobs: with: name: artifact-disk-image-${{ matrix.target }} path: output/images/*.qcow2 + + - uses: actions/upload-artifact@v7 + with: + name: artifact-pkg-${{ matrix.target }} + path: output/images/*.pkg diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7de5995f..b08d247b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,7 +95,7 @@ jobs: makeLatest: ${{ steps.rel.outputs.latest }} discussionCategory: ${{ steps.rel.outputs.cat }} bodyFile: release.md - artifacts: "*.tar.gz,*.qcow2" + artifacts: "*.tar.gz,*.qcow2,*.pkg,*.img.xz" - name: Summary run: | diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index 9df059a7..2fa449f6 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -10,6 +10,8 @@ All notable changes to the project are documented in this file. - Add support for firewall address-set (ipset): named sets of IP addresses and networks, usable as zone sources for per-IP access control, issue #1189 +- Build RPi64 SD card images in release builds +- Include .pkg files in release builds ### Fixes