Skip to content

Commit

Permalink
CentOS 8 Stream is EOL, test on AlmaLinux 8 instead.
Browse files Browse the repository at this point in the history
  • Loading branch information
adelton committed Jun 5, 2024
1 parent d0fefde commit 7d42590
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ fedora-latest, fedora-rawhide, centos-stream8, centos-stream9 ]
os:
- registry.fedoraproject.org/fedora:latest
- registry.fedoraproject.org/fedora:rawhide
- docker.io/almalinux:8
- quay.io/centos/centos:stream9
steps:
- uses: actions/checkout@v4
- name: Set the right OS in the Dockerfile
run: sed -i "s#^FROM.*#FROM $( echo ${{ matrix.os }} | sed 's#^fedora-#registry.fedoraproject.org/fedora:#; s#^centos-#quay.io/centos/centos:#;' )#" tests/Dockerfile
run: sed -i "s#^FROM.*#FROM ${{ matrix.os }}#" tests/Dockerfile
- name: Build image
run: docker build -t python-libssh -f tests/Dockerfile .
- name: Run container
Expand Down
7 changes: 3 additions & 4 deletions tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM registry.fedoraproject.org/fedora
RUN if test -f /etc/centos-release ; then dnf install -y 'dnf-command(config-manager)' ; fi
RUN if test -f /etc/centos-release && grep 'CentOS Stream release 8' /etc/centos-release ; then \
dnf config-manager --set-enabled powertools ; \
rm -f /run/nologin ; fi
RUN if ! test -f /etc/fedora-release ; then dnf install -y 'dnf-command(config-manager)' ; fi
RUN if test -f /etc/almalinux-release && grep 'AlmaLinux release 8' /etc/almalinux-release ; then \
dnf config-manager --set-enabled powertools ; fi
RUN if test -f /etc/centos-release && grep 'CentOS Stream release 9' /etc/centos-release ; then \
dnf config-manager --set-enabled crb ; fi
RUN dnf install -y --setopt=install_weak_deps=False python3-devel python3-setuptools python3-Cython make gcc libssh-devel openssh-server openssh-clients rpm-build
Expand Down

0 comments on commit 7d42590

Please sign in to comment.