public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/crossdev:master commit in: .github/workflows/
Date: Tue, 12 Nov 2024 15:24:16 +0000 (UTC)	[thread overview]
Message-ID: <1731425040.a46280d73c8eef5fafc705d2b91363ae32b48bcf.sam@gentoo> (raw)

commit:     a46280d73c8eef5fafc705d2b91363ae32b48bcf
Author:     Michal Rostecki <vadorovsky <AT> protonmail <DOT> com>
AuthorDate: Tue Nov 12 14:12:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <vadorovsky <AT> protonmail.com>
Closes: https://github.com/gentoo/crossdev/pull/27
Signed-off-by: Sam James <sam <AT> 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
+            "


             reply	other threads:[~2024-11-12 15:24 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-12 15:24 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-04 15:19 [gentoo-commits] proj/crossdev:master commit in: .github/workflows/ Sam James
2025-01-04 15:19 Sam James
2025-01-04 15:19 Sam James
2025-01-04 15:19 Sam James
2025-01-04 15:19 Sam James
2025-01-04 15:19 Sam James
2025-01-04 15:19 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2025-01-03 11:15 Sam James
2024-11-12  8:46 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1731425040.a46280d73c8eef5fafc705d2b91363ae32b48bcf.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox