Update QEMU info CI job

uraimo · Feb 27, 2025 · 00c9c74 · 00c9c74
1 parent d78ce44
commit 00c9c74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml
@@ -43,10 +43,6 @@ jobs:
           echo ::set-output name=host_env_distro::"$env_distro"
           echo ::set-output name=host_shell_options::"$-"
           
-          # List all qemu packages, including qemu-user-static platforms
-          QEMULOCATION=$(dirname `which qemu-system-x86_64`) ; ls $QEMULOCATION/qemu-*
-          qemu-system-x86_64 -version
-
         install: |
               apt-get update -q -y
               apt-get install -q -y git

diff --git a/src/run-on-arch.sh b/src/run-on-arch.sh
@@ -35,9 +35,10 @@ install_deps () {
   # Install support for non-x86 emulation in Docker via QEMU.
   # Platforms: linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x,
   #            linux/386, linux/arm/v7, linux/arm/v6
-  sudo apt-get update -q -y
-  sudo apt-get -qq install -y qemu qemu-user-static
+  sudo apt update -q -y
   docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes
+  docker run --rm --privileged --tty multiarch/qemu-user-static:latest ls /usr/bin/
+
 }
 
 build_container () {
@@ -61,7 +62,7 @@ build_container () {
 
     # Login without echoing token, just in case
     BASH_FLAGS="$-"
-    set +x
+#    set +x
     echo "$GITHUB_TOKEN" | docker login ghcr.io \
       -u "$GITHUB_ACTOR" \
       --password-stdin
@@ -137,7 +138,7 @@ run_container () {
 
 # Installing deps produces a lot of log noise, so we do so quietly
 quiet rm -f build-log.txt
-quiet install_deps
+install_deps
 
 echo "::group::Build container"
 build_container