Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ci): Update testing matrix #3400

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/libdnf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
fail-fast: false
matrix:
include:
- name: "CentOS Stream 9"
image: "quay.io/centos/centos:stream9"
- name: "CentOS Stream 10"
image: "quay.io/centos/centos:stream10-development"
- name: "Fedora latest"
image: "registry.fedoraproject.org/fedora:latest"
- name: "Fedora Rawhide"
Expand All @@ -28,7 +28,7 @@ jobs:
uses: actions/checkout@v4

- name: "Enable CRB repository"
if: ${{ matrix.name == 'CentOS Stream 9' }}
if: ${{ matrix.name == 'CentOS Stream 10' }}
run: |
dnf --setopt install_weak_deps=False install -y dnf-plugins-core
dnf config-manager --enable crb
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
fail-fast: false
matrix:
include:
- name: "CentOS Stream 9"
image: "quay.io/centos/centos:stream9"
- name: "CentOS Stream 10"
image: "quay.io/centos/centos:stream10-development"
pytest_args: ''
- name: "Fedora latest"
image: "registry.fedoraproject.org/fedora:latest"
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/tito.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ jobs:
fail-fast: false
matrix:
include:
- name: "CentOS Stream 9"
image: "quay.io/centos/centos:stream9"
- name: "CentOS Stream 10"
image: "quay.io/centos/centos:stream10-development"
packager: "dnf4"
- name: "Fedora latest"
image: "registry.fedoraproject.org/fedora:latest"
packager: "dnf4"
- name: "Fedora Rawhide"
image: "registry.fedoraproject.org/fedora:rawhide"
packager: "dnf5"

runs-on: ubuntu-latest
container:
Expand All @@ -30,7 +33,7 @@ jobs:
git-core dnf-plugins-core rpm-build sudo

- name: Enable CRB repository
if: ${{ matrix.name == 'CentOS Stream 9' }}
if: ${{ matrix.name == 'CentOS Stream 10' }}
run: |
dnf config-manager --enable crb

Expand All @@ -43,6 +46,11 @@ jobs:
run: |
git config --global --add safe.directory '*'

- name: "Install builddep subcommand"
run: |
dnf --setopt install_weak_deps=False install -y "dnf5-command(builddep)"
if: matrix.packager == 'dnf5'

- name: Install packages
run: |
dnf --setopt install_weak_deps=False builddep -y \
Expand Down
2 changes: 1 addition & 1 deletion scripts/container-pre-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source /etc/os-release
# These repositories are required for the 'libdnf-devel' package.
# Fedora has it available out of the box.
# RHEL needs it to be enabled via 'subscription-manager repos'.
if [[ $ID == "centos" && $VERSION == "9" ]]; then
if [[ $ID == "centos" ]]; then
dnf config-manager --enable crb
fi

Expand Down
Loading