From nobody Wed Jul 13 18:44:58 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 18B191D0BD80; Wed, 13 Jul 2022 18:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ljmky70bSz402p; Wed, 13 Jul 2022 18:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657737899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VaP6VHAbT7FPPuUTfnX9SU74rpYVwPVqpydf8f37mSA=; b=FIeQvpyEMdD1kqNrbdZegPQ5bc5vLVrtiYbOPU3P1b6Nn6PGKoS6FI/hEJegxMuWyn9fia wY0gdDoQlD1KVHsrulocSukVFkJbx1NMGAnvU9jxUrcXlft1wFE7L6R0QA9JDXiGrIN47W P3vvu9JZSLk2O2gD1NKAFkeTmF8aEoaZdml2PQl5LyqdZozsrEimxo/3Q316+R1jZ2Ghk/ 6alvTP+M5wdRjAnqlN0mg3II6bOeGTdYxDRdZAQ+A8gRI22s7DIB/+sw8t6uRrVrE638Lo uq7t5dEeI/cXWw38zEldqXmXPZkVmkP+iSHCYpl6PcTR0qUKmiL0LJ0pAZasJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ljmky668KzZDb; Wed, 13 Jul 2022 18:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DIiwQR015972; Wed, 13 Jul 2022 18:44:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DIiwuk015971; Wed, 13 Jul 2022 18:44:58 GMT (envelope-from git) Date: Wed, 13 Jul 2022 18:44:58 GMT Message-Id: <202207131844.26DIiwuk015971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0d53db064e87 - stable/13 - .github: Cross-build aarch64 as well as amd64 kernels. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d53db064e8782a9ef771a6de8d397ffb5436980 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657737899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VaP6VHAbT7FPPuUTfnX9SU74rpYVwPVqpydf8f37mSA=; b=BvI86M3AqHbCI9qtqi5uEjzeF1xlwQKib1ciMEiwUno9TkSsz+vHASC7GR8OrpZszNp/s0 uy24Zr6Ogr3AOdHEIbP08Wc1Uxd8MSife/K0FoTlDa8EOp4C8lToeMK7M0aguKd4BMwWMm 8MaK2nOXHku/6SwbDpzhNTQoTvPDlPm8J56j5xQigwpdyrATGDdytgQbH4dXt3zMhc9sbi cG2ufJv3PneJtycyF3mWzo0Hv5AEPd3hQ8MM9RvaCaMQdASGJeww00mwQ6NBEEBOBn3azQ Kt3FqAwYtiuJpr8z/CVR194jQRqPoHQUihEi4mqx6DFjqV7wHZa3X/JQsWO/xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657737899; a=rsa-sha256; cv=none; b=KODtHhi5LPnjDGbudw7CiFDSNJZxVawihJdDvKJi8k6ACwAbYKW1WcNhtxkrqyRq9ZRyDP XCxCGiLugWdA2GlORvBtsIec8Df26P06DssEAvAY82/J0o7d9XwJV3vOFSYlnT9auCA/28 8LmMIp1Rs9xU2zsrex3ea9g4mMDnZFFcPqbRR+sEDWyTZWbV90xFjLj4HyLFzjIPA/D2vS HqlQWfLSBIQrWyblt+Jw9+HHGTpYVuYf95ndMSMDSXKnae7gpcx1tDA9j8fiQFL13Begvf MPKLwYZQamvJeT9htB+AoaK6ayId7DdCn7QLG8yHcQhCajkjNJsbOwlBZMXTxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0d53db064e8782a9ef771a6de8d397ffb5436980 commit 0d53db064e8782a9ef771a6de8d397ffb5436980 Author: John Baldwin AuthorDate: 2022-06-09 17:20:03 +0000 Commit: John Baldwin CommitDate: 2022-07-13 18:44:26 +0000 .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 (cherry picked from commit 3491ed652e0af484b8357ba67e45af17a0e54173) --- .github/workflows/cross-bootstrap-tools.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index fbe8fc936706..3388cc918582 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -8,11 +8,13 @@ on: jobs: build: - name: ${{ matrix.os }} (${{ matrix.compiler }}) + name: ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: + target_arch: [ amd64, aarch64 ] + os: [ ubuntu-20.04, macos-latest ] include: # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy. - os: ubuntu-20.04 @@ -23,6 +25,10 @@ jobs: compiler: clang-13 cross-bindir: /usr/local/opt/llvm/bin pkgs: bmake libarchive + - target_arch: amd64 + target: amd64 + - target_arch: aarch64 + target: arm64 steps: - uses: actions/checkout@v2 - name: install packages (Ubuntu) @@ -46,8 +52,8 @@ jobs: # heh, works on Linux/BSD/macOS ... echo "NPROC=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`" >> $GITHUB_ENV - 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 - 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 - 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