From 37a272b71f945095d4e3fb6564f97ca218afe30a Mon Sep 17 00:00:00 2001 From: Tom Scogland Date: Tue, 22 Aug 2023 16:19:55 -0700 Subject: [PATCH] remove 386 until we can fix it better 386 is very, very broken, and also complicated by a bug in qemu-user and/or the linux kernel depending on who you ask. --- .github/workflows/main.yml | 3 ++- src/test/generate-matrix.py | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0291857a5..bf7d1e82a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -180,7 +180,8 @@ jobs: (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master') run: | echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker manifest create fluxrm/flux-core:bookworm fluxrm/flux-core:bookworm-amd64 fluxrm/flux-core:bookworm-386 fluxrm/flux-core:bookworm-arm64 + # maybe bring back later: fluxrm/flux-core:bookworm-386 + docker manifest create fluxrm/flux-core:bookworm fluxrm/flux-core:bookworm-amd64 fluxrm/flux-core:bookworm-arm64 docker manifest push fluxrm/flux-core:bookworm - name: upload tarball diff --git a/src/test/generate-matrix.py b/src/test/generate-matrix.py index 6ed4ffd78..dcfa98372 100755 --- a/src/test/generate-matrix.py +++ b/src/test/generate-matrix.py @@ -119,13 +119,13 @@ def __str__(self): # Debian: no args matrix.add_build(name="bookworm") -# Debian: 32b -matrix.add_build( - name="bookworm - 32 bit", - image="bookworm", - platform="linux/386", - docker_tag=True, -) +# # Debian: 32b -- NOTE: VERY broken right now +# matrix.add_build( +# name="bookworm - 32 bit", +# image="bookworm", +# platform="linux/386", +# docker_tag=True, +# ) # Debian: arm64, expensive, only on master and tags, only install if matrix.branch == "master" or matrix.tag: