Skip to content

Commit 655354c

Browse files
committed
tidy
1 parent dfeb07b commit 655354c

2 files changed

Lines changed: 7 additions & 13 deletions

File tree

.github/workflows/Dockerfile.architectures

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Use an s390x Ubuntu base image
21
FROM ubuntu
32

43
ENV DEBIAN_FRONTEND=noninteractive
@@ -20,22 +19,16 @@ RUN apt-get update && apt-get install -y \
2019
build-essential \
2120
&& rm -rf /var/lib/apt/lists/*
2221

23-
# Upgrade pip tooling
24-
RUN python3 -m pip install --upgrade pip setuptools wheel
22+
# RUN python3 -m pip install --upgrade pip setuptools wheel
2523

26-
# Set work directory
2724
WORKDIR /ffcx
28-
29-
# Copy FFCx source tree
3025
COPY . .
3126

32-
# Install FEniCS dependencies from git
3327
RUN pip install \
3428
git+https://github.com/FEniCS/ufl.git \
3529
git+https://github.com/FEniCS/basix.git
3630

37-
# Install FFCx with CI + optional dependencies
3831
RUN pip install .[ci,optional]
3932

40-
# Default command: run unit tests
41-
CMD python -m pytest test/ -W error
33+
RUN python -m pytest test/ -n auto -W error
34+
RUN python -m pytest test/ -n auto -W error

.github/workflows/architectures.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ on:
1717
jobs:
1818
run:
1919
runs-on: ubuntu-latest
20+
strategy:
21+
matrix:
22+
arch: ["s390x"]
2023
steps:
2124
- name: Checkout repository
2225
uses: actions/checkout@v4
2326

24-
# Enable QEMU for s390x emulation
2527
- name: Set up QEMU
2628
uses: docker/setup-qemu-action@v3
2729
with:
28-
platforms: s390x
30+
platforms: ${{ matrix.arch }}
2931

30-
# Enable Docker Buildx
3132
- name: Set up Docker Buildx
3233
uses: docker/setup-buildx-action@v3
3334

0 commit comments

Comments
 (0)