Skip to content

Commit

Permalink
Merge pull request #1327 from jameshcorbett/stop-alpine
Browse files Browse the repository at this point in the history
ci: drop alpine
  • Loading branch information
mergify[bot] authored Jan 15, 2025
2 parents 5ae7459 + bf490de commit 234835c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ jobs:
(startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master')
run: |
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
for d in el9 noble alpine bookworm ; do
for d in el9 noble bookworm ; do
docker manifest create fluxrm/flux-sched:$d fluxrm/flux-sched:$d-amd64 fluxrm/flux-sched:$d-arm64
docker manifest push fluxrm/flux-sched:$d
done
18 changes: 10 additions & 8 deletions src/test/generate-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,16 @@ def __str__(self):
CHECK_RUN_SOURCE_ENV="/opt/rh/gcc-toolset-13/enable",
),
)
matrix.add_multiarch_build(
name="alpine",
default_suffix=" - test-install",
args=common_args,
env=dict(
TEST_INSTALL="t",
),
)
# Disabled because the arm64 build is failing and preventing the
# generate-manifest step from running
# matrix.add_multiarch_build(
# name="alpine",
# default_suffix=" - test-install",
# args=common_args,
# env=dict(
# TEST_INSTALL="t",
# ),
# )
# single arch builds that still produce a container
matrix.add_build(
name="fedora40 - test-install",
Expand Down

0 comments on commit 234835c

Please sign in to comment.