Skip to content

Commit

Permalink
.github(Fedora): Update fedora release versions to 38 and 39
Browse files Browse the repository at this point in the history
The versions 36 and 37 were no longer supported.
This commit also adds a script to generate the release-version specific
files so that it's easier to maintain the target release versions.
  • Loading branch information
norihiro committed Apr 17, 2024
1 parent c91e817 commit a335af8
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:36
FROM fedora:%releasever%

RUN dnf install -y rpm-build python3-dnf-plugins-core && dnf clean all

Expand Down
4 changes: 4 additions & 0 deletions .github/containers/fedora-template/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#! /bin/bash
set -ex
.github/containers/fedora-common/build.sh obs-plugin-build/fedora%releasever% fedora%releasever%-rpmbuild
echo 'FILE_NAME=fedora%releasever%-rpmbuild/*RPMS/**/*.rpm' >> $GITHUB_ENV
4 changes: 0 additions & 4 deletions .github/containers/fedora36/build.sh

This file was deleted.

14 changes: 0 additions & 14 deletions .github/containers/fedora37/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions .github/containers/fedora37/build.sh

This file was deleted.

10 changes: 8 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
fail-fast: false
matrix:
target:
- fedora36
- fedora37
- fedora38
- fedora39
defaults:
run:
shell: bash
Expand All @@ -39,6 +39,12 @@ jobs:
fetch-depth: 0
submodules: recursive

- name: Generate container directory
run: |
cp -a .github/containers/fedora-template .github/containers/$target
releasever="$(cut -b 7- <<< "$target")"
sed -i "s/%releasever%/$releasever/g" .github/containers/$target/*
- name: Restore docker from cache
id: docker-cache
uses: actions/cache/restore@v4
Expand Down

0 comments on commit a335af8

Please sign in to comment.