Run steps inside opensuse/leap Docker container

mcepl · mcepl · commit 33561184738e · 2025-08-14T22:14:45.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,5 @@
 name: Tests
 
-# bpo-40548: "paths-ignore" is not used to skip documentation-only PRs, because
-# it prevents to mark a job as mandatory. A PR cannot be merged if a job is
-# mandatory but not scheduled because of "paths-ignore".
 on:
   pull_request:
 
@@ -13,44 +10,46 @@ jobs:
     outputs:
       run_tests: ${{ steps.check.outputs.run_tests }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
             fetch-depth: 1000
       - name: Check for source changes
         id: check
         run: |
           if [ -z "$GITHUB_BASE_REF" ]; then
-            echo '::set-output name=run_tests::true'
+            echo "run_tests=true" >> "$GITHUB_OUTPUT"
           else
             git fetch origin $GITHUB_BASE_REF --depth=1
-            # git diff "origin/$GITHUB_BASE_REF..." (3 dots) may be more
-            # reliable than git diff "origin/$GITHUB_BASE_REF.." (2 dots),
-            # but it requires to download more commits (this job uses
-            # "git fetch --depth=1").
-            #
-            # git diff "origin/$GITHUB_BASE_REF..." (3 dots) works with Git
-            # 2.26, but Git 2.28 is stricter and fails with "no merge base".
-            #
-            # git diff "origin/$GITHUB_BASE_REF.." (2 dots) should be enough on
-            # GitHub, since GitHub starts by merging origin/$GITHUB_BASE_REF
-            # into the PR branch anyway.
-            #
-            # https://github.com/python/core-workflow/issues/373
-            git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
+            # git diff using 2 dots should be enough on GitHub.
+            # See https://github.com/python/core-workflow/issues/373
+            git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo "run_tests=true" >> "$GITHUB_OUTPUT" || true
           fi
 
-  check_abi:
-    name: 'Check if the ABI has changed'
-    runs-on: ubuntu-20.04
+  check_abi_opensuse:
+    name: 'Check ABI (openSUSE Leap)'
+    runs-on: ubuntu-latest
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    container:
+      image: opensuse/leap:latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: |
-            sudo ./.github/workflows/posix-deps-apt.sh
-            sudo apt-get install -yq abigail-tools
+          zypper --non-interactive install --auto-agree-with-licenses \
+            gcc \
+            make \
+            libabigail-tools \
+            libffi-devel \
+            zlib-devel \
+            ncurses-devel \
+            gdbm-devel \
+            sqlite3-devel \
+            tk-devel \
+            readline-devel \
+            xz-devel \
+            bzip2 \
+            openssl
       - name: Build CPython
         env:
           CFLAGS: -g3 -O0
@@ -61,16 +60,31 @@ jobs:
       - name: Check for changes in the ABI
         run: make check-abidump
 
-  check_generated_files:
-    name: 'Check if generated files are up to date'
+  check_generated_files_opensuse:
+    name: 'Check generated files (openSUSE Leap)'
     runs-on: ubuntu-latest
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    container:
+      image: opensuse/leap:latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
       - name: Install Dependencies
-        run: sudo ./.github/workflows/posix-deps-apt.sh
+        run: |
+          zypper --non-interactive install --auto-agree-with-licenses \
+            gcc \
+            make \
+            tar \
+            libffi-devel \
+            zlib-devel \
+            ncurses-devel \
+            gdbm-devel \
+            sqlite3-devel \
+            tk-devel \
+            readline-devel \
+            xz-devel \
+            bzip2 \
+            openssl
       - name: Build CPython
         run: |
           ./configure --with-pydebug
@@ -88,23 +102,41 @@ jobs:
       - name: Check exported libpython symbols
         run: make smelly
 
-  build_ubuntu:
-    name: 'Ubuntu'
-    runs-on: ubuntu-20.04
+  build_opensuse:
+    name: 'Build and Test (openSUSE Leap)'
+    runs-on: ubuntu-latest # The host runner is still Ubuntu
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    container:
+      image: opensuse/leap:latest # But steps run inside this container
     env:
       OPENSSL_VER: 1.1.1u
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install Dependencies
-      run: sudo ./.github/workflows/posix-deps-apt.sh
+      run: |
+        zypper --non-interactive install --auto-agree-with-licenses \
+          gcc \
+          make \
+          tar \
+          python3 \
+          xorg-x11-server-Xvfb \
+          libffi-devel \
+          zlib-devel \
+          ncurses-devel \
+          gdbm-devel \
+          sqlite3-devel \
+          tk-devel \
+          readline-devel \
+          xz-devel \
+          bzip2
     - name: 'Restore OpenSSL build'
       id: cache-openssl
       uses: actions/cache@v4
       with:
         path: ./multissl/openssl/${{ env.OPENSSL_VER }}
-        key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
+        # Updated key to be specific to the OS distribution
+        key: opensuse-leap-multissl-openssl-${{ env.OPENSSL_VER }}
     - name: Install OpenSSL
       if: steps.cache-openssl.outputs.cache-hit != 'true'
       run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $PWD/multissl --openssl $OPENSSL_VER --system Linux
@@ -115,4 +147,4 @@ jobs:
     - name: Display build info
       run: make pythoninfo
     - name: Tests
-      run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
+      run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: 'Install Dependencies'
-      run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install wamerican
+      run: sudo ./.github/workflows/posix-deps-zypp.sh && sudo apt-get install wamerican
     - name: 'Configure CPython'
       run: ./configure --with-pydebug
     - name: 'Build CPython'
diff --git a/.github/workflows/posix-deps-apt.sh b/.github/workflows/posix-deps-apt.sh
diff --git a/.github/workflows/posix-deps-zypp.sh b/.github/workflows/posix-deps-zypp.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+zypper refresh --force
+
+zypper install --auto-agree-with-licenses --force \
+    pattern:devel_rpm_build pattern:devel_C_C++ \
+    zlib-devel \
+    libbz2-devel \
+    ncurses-devel \
+    readline6-devel \
+    sqlite3-devel \
+    openssl-devel \
+    gdbm-devel \
+    tk-devel \
+    lzma \
+    lzma-devel \
+    liblzma-devel \
+    libffi-devel \
+    uuid-devel \
+    xvfb \
+    lcov
