From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 84726158042 for ; Tue, 12 Nov 2024 15:24:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D4A7E07F0; Tue, 12 Nov 2024 15:24:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76473E07F0 for ; Tue, 12 Nov 2024 15:24:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC8B6340CA7 for ; Tue, 12 Nov 2024 15:24:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AA8316D2 for ; Tue, 12 Nov 2024 15:24:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731425040.a46280d73c8eef5fafc705d2b91363ae32b48bcf.sam@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: .github/workflows/ X-VCS-Repository: proj/crossdev X-VCS-Files: .github/workflows/crossdev.yml X-VCS-Directories: .github/workflows/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a46280d73c8eef5fafc705d2b91363ae32b48bcf X-VCS-Branch: master Date: Tue, 12 Nov 2024 15:24:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d1767ec5-74e5-4150-8c36-b45952af5b4f X-Archives-Hash: 5bd99d97e52dc8df51265d17d9158e39 commit: a46280d73c8eef5fafc705d2b91363ae32b48bcf Author: Michal Rostecki protonmail com> AuthorDate: Tue Nov 12 14:12:01 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 12 15:24:00 2024 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=a46280d7 ci: Run the container explicitly with `docker run` Using `container:` setting in GitHub actions unfortunately doesn't work with musl-llvm Gentoo images. The reason is that GitHub actions are injecting a NodeJS binary and for distros other than Alpine, it injects a binary linked against glibc.[0] The proper fix would involve either defaulting to musl or making the libc detection in the container system smarter, but for now, let's just run the container manually. [0] https://github.com/actions/runner/blob/6ef5803f24724b77a8d3599a478d06018da5d7c6/src/Runner.Worker/Handlers/StepHost.cs#L143-L172 Signed-off-by: Michal Rostecki protonmail.com> Closes: https://github.com/gentoo/crossdev/pull/27 Signed-off-by: Sam James gentoo.org> .github/workflows/crossdev.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/crossdev.yml b/.github/workflows/crossdev.yml index 5af15bb..321bb31 100644 --- a/.github/workflows/crossdev.yml +++ b/.github/workflows/crossdev.yml @@ -22,26 +22,27 @@ jobs: - musl name: crossdev target=${{ matrix.target }} stage3=${{ matrix.stage3 }} runs-on: ubuntu-latest - container: docker.io/gentoo/stage3:${{ matrix.stage3 }} steps: - uses: actions/checkout@v4 - - name: Install dependencies + - name: Create cross environment run: | - emerge --sync --quiet - emerge \ - app-eselect/eselect-repository \ - sys-apps/config-site + docker run -v $(pwd):/workspace -w /workspace \ + docker.io/gentoo/stage3:${{ matrix.stage3 }} bash -c " + # Install dependencies + emerge --sync --quiet + emerge \ + app-eselect/eselect-repository \ + sys-apps/config-site - - name: Install crossdev - run: make install + # Install crossdev + make install - - name: Create cross environment - run: | - eselect repository create crossdev - crossdev ${{ matrix.args }} --target ${{ matrix.target }} + # Create cross environment + eselect repository create crossdev + crossdev ${{ matrix.args }} --target ${{ matrix.target }} - # zstd and its dependencies need both C and C++ toolchain. If any of them - # is broken, the installation will fail. - - name: Sanity check - run: ${{ matrix.target }}-emerge app-arch/zstd + # zstd and its dependencies need both C and C++ toolchain. If any of them + # is broken, the installation will fail. + run: ${{ matrix.target }}-emerge app-arch/zstd + "