.github: Cross-build aarch64 as well as amd64 kernels.

This required adding an explicit os list to the matrix.

Reviewed by:	uqs
Pull Request:	https://github.com/freebsd/freebsd-src/pull/599
This commit is contained in:
John Baldwin 2022-06-09 10:20:03 -07:00
parent 49335eda0f
commit 3491ed652e

View File

@ -8,11 +8,13 @@ on:
jobs: jobs:
build: build:
name: ${{ matrix.os }} (${{ matrix.compiler }}) name: ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }})
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
target_arch: [ amd64, aarch64 ]
os: [ ubuntu-20.04, macos-latest ]
include: include:
# TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy. # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy.
- os: ubuntu-20.04 - os: ubuntu-20.04
@ -23,6 +25,10 @@ jobs:
compiler: clang-13 compiler: clang-13
cross-bindir: /usr/local/opt/llvm/bin cross-bindir: /usr/local/opt/llvm/bin
pkgs: bmake libarchive pkgs: bmake libarchive
- target_arch: amd64
target: amd64
- target_arch: aarch64
target: arm64
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install packages (Ubuntu) - name: install packages (Ubuntu)
@ -46,8 +52,8 @@ jobs:
# heh, works on Linux/BSD/macOS ... # heh, works on Linux/BSD/macOS ...
echo "NPROC=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`" >> $GITHUB_ENV echo "NPROC=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`" >> $GITHUB_ENV
- name: bootstrap bmake - name: bootstrap bmake
run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64 TARGET_ARCH=amd64 -n run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=${{ matrix.target }} TARGET_ARCH=${{ matrix.target_arch }} -n
- name: make kernel-toolchain - name: make kernel-toolchain
run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64 TARGET_ARCH=amd64 kernel-toolchain -s -j$NPROC run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=${{ matrix.target }} TARGET_ARCH=${{ matrix.target_arch }} kernel-toolchain -s -j$NPROC
- name: make buildkernel - name: make buildkernel
run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64 TARGET_ARCH=amd64 KERNCONF=GENERIC NO_MODULES=yes buildkernel -s -j$NPROC $EXTRA_MAKE_ARGS run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=${{ matrix.target }} TARGET_ARCH=${{ matrix.target_arch }} KERNCONF=GENERIC NO_MODULES=yes buildkernel -s -j$NPROC $EXTRA_MAKE_ARGS