From 5a73f98541a4164b57d7f5b94c365cb52731011b Mon Sep 17 00:00:00 2001
From: William Jamieson <wjamieson@stsci.edu>
Date: Sat, 16 Apr 2022 11:03:08 -0400
Subject: [PATCH] Merge pull request #1135 from WilliamJamieson/ci/s390x

---
 .github/workflows/s390x.yml | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/s390x.yml b/.github/workflows/s390x.yml
index fe88b0856..b37453f7c 100644
--- a/.github/workflows/s390x.yml
+++ b/.github/workflows/s390x.yml
@@ -2,38 +2,57 @@ name: s390x
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - '*'
   schedule:
     # Run every Monday at 6am UTC
     - cron: '0 6 * * 1'
+  pull_request:
+    # We also want this workflow triggered if the `s390x` label is
+    # added or present when PR is updated
+    types:
+      - synchronize
+      - labeled
+  push:
+    branches:
+      - '*.*.x'
+    tags:
+      - '*'
 
 jobs:
   pytest:
+    name: Python 3.8
     runs-on: ubuntu-18.04
-    name: Python 3.7
+    if: (github.repository == 'asdf-format/asdf' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 's390x')))
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
           submodules: true
-      - uses: uraimo/run-on-arch-action@v2.0.5
+      - uses: uraimo/run-on-arch-action@v2.2.0
         name: Run tests
         id: build
         with:
           arch: s390x
-          distro: buster
+          distro: bullseye
           shell: /bin/bash
           install: |
+            echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
             apt-get update -q -y
             apt-get install -q -y git \
+                                  g++ \
+                                  pkg-config \
                                   python3 \
+                                  python3-configobj \
                                   python3-astropy \
                                   python3-lz4 \
                                   python3-numpy \
+                                  python3-ply \
                                   python3-venv \
-                                  python3-wheel
+                                  python3-wheel \
+                                  cython3 \
+                                  libwcs7/bullseye-backports \
+                                  wcslib-dev/bullseye-backports \
+                                  libcfitsio-dev \
+                                  liberfa1
           run: |
             python3 -m venv --system-site-packages tests
             source tests/bin/activate