From ffa720c4f3d4966ad35a5e1b5867bdb778fa8428 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Sun, 4 Aug 2024 17:17:49 +0200 Subject: [PATCH] Migrated to fedora-minimal docker container for GitHub Actions --- .github/workflows/fedora-build.yml | 9 ++++----- .github/workflows/fedora-copr.yml | 5 +++-- .github/workflows/linting.yml | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml index 9d2bf9d2..0db6e12a 100644 --- a/.github/workflows/fedora-build.yml +++ b/.github/workflows/fedora-build.yml @@ -11,15 +11,14 @@ on: jobs: fedora-build: - container: fedora:latest + container: registry.fedoraproject.org/fedora-minimal:latest runs-on: ubuntu-latest steps: - name: Install tooling for source RPM build run: | - dnf -y install @development-tools @rpm-development-tools - dnf -y install rpkg git - dnf -y install 'dnf-command(builddep)' + microdnf -y install --nodocs --setopt=install_weak_deps=0 \ + @development-tools @rpm-development-tools rpkg git 'dnf-command(builddep)' # It is necessary to checkout into sub-directory, because of some weird ownership problems cause by using containers - name: Check out sources @@ -42,7 +41,7 @@ jobs: - name: Install build dependencies run: | cd swaync - dnf -y builddep ./specs/swaync.rpkg.spec + microdnf -y builddep ./specs/swaync.rpkg.spec - name: Local build run: | diff --git a/.github/workflows/fedora-copr.yml b/.github/workflows/fedora-copr.yml index 3409a000..9f93dec7 100644 --- a/.github/workflows/fedora-copr.yml +++ b/.github/workflows/fedora-copr.yml @@ -9,7 +9,7 @@ on: jobs: fedora-copr: - container: fedora:latest + container: registry.fedoraproject.org/fedora-minimal:latest runs-on: ubuntu-latest steps: @@ -29,7 +29,8 @@ jobs: - name: Install tooling for source RPM build run: | - dnf -y install copr-cli rpkg git + microdnf -y install --nodocs --setopt=install_weak_deps=0 \ + copr-cli rpkg git # It is necessary to checkout into sub-directory, because of some weird ownership problems cause by using containers - name: Check out sources diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 03746888..b7609457 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -25,11 +25,13 @@ jobs: fail: true rpmlint: - container: fedora:latest + container: registry.fedoraproject.org/fedora-minimal:latest runs-on: ubuntu-latest steps: - name: Install rpmlint - run: dnf -y install rpmlint rpkg + run: | + microdnf -y install --nodocs --setopt=install_weak_deps=0 \ + rpmlint rpkg - name: Check out sources uses: actions/checkout@v3