Skip to content

Commit

Permalink
Build and release using AlmaLinux 8 and 9. Prepare release 0.3.1. (#9)
Browse files Browse the repository at this point in the history
Build and release using AlmaLinux 8 and 9. Prepare release 0.3.1.

```markdown
## [0.3.1] - 2023-03-17

### Changed

- Build and release packages using AlmaLinux 8 and 9. (#9) (Baptiste Grenier)
```
  • Loading branch information
gwarf authored Mar 20, 2023
1 parent 2e29117 commit af00062
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 38 deletions.
34 changes: 19 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ jobs:
path: |
build/RPMS/noarch/glite-info-static-*.el7.noarch.rpm
# Use a matrix for CentOS Stream versions
# Use a matrix for AlmaLinux versions
build:
strategy:
matrix:
centos-version: [8, 9]
name: Build CentOS ${{ matrix.centos-version }} RPMs
almalinux-version: [8, 9]
name: Build AlmaLinux ${{ matrix.almalinux-version }} RPMs
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream${{ matrix.centos-version }}
container: almalinux:${{ matrix.almalinux-version }}
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -48,13 +48,13 @@ jobs:
- name: build rpm
run: |
make clean rpm
rpmlint --file .rpmlint.ini build/RPMS/noarch/*.el${{ matrix.centos-version }}.noarch.rpm
rpmlint --file .rpmlint.ini build/RPMS/noarch/*.el${{ matrix.almalinux-version }}.noarch.rpm
- name: Upload RPMs
uses: actions/upload-artifact@v3
with:
name: rpms${{ matrix.centos-version }}
name: rpms${{ matrix.almalinux-version }}
path: |
build/RPMS/noarch/glite-info-static-*.el${{ matrix.centos-version }}.noarch.rpm
build/RPMS/noarch/glite-info-static-*.el${{ matrix.almalinux-version }}.noarch.rpm
install-centos7:
name: Install CentOS 7 RPMs
Expand All @@ -69,27 +69,31 @@ jobs:
run: |
yum localinstall -y glite-info-static-*.el7.noarch.rpm
# Dependency from PowerTools: openldap-servers
centos8-install:
name: Install CentOS Stream 8 RPMs
# FIXME: openldap-servers is in CentOS 8 Stream Powertools, but not in AlmaLinux PowerTools
# See https://bugs.almalinux.org/view.php?id=222
# Currently instaling using the package from devel repository
# See https://bugs.almalinux.org/view.php?id=100
# https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/
almalinux8-install:
name: Install AlmaLinux 8 RPMs
needs: build
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream8
container: almalinux:8
steps:
- uses: actions/download-artifact@v3
with:
name: rpms8
- name: Install generated RPMs
run: |
sed -i 's/^enabled=0/enabled=1/' /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
yum install -y https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/openldap-servers-2.4.46-18.el8.x86_64.rpm
yum localinstall -y glite-info-static-*.el8.noarch.rpm
# XXX Dependencies from EPEL: openldap-servers
centos9-install:
name: Install CentOS Stream 9 RPMs
almalinux9-install:
name: Install AlmaLinux 9 RPMs
needs: build
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream9
container: almalinux:9
steps:
- uses: actions/download-artifact@v3
with:
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
build/RPMS/noarch/glite-info-static-*-1.el7.noarch.rpm
build/SRPMS/glite-info-static-*-1.el7.src.rpm
centos8:
name: Build CentOS Stream 8 RPMs
almalinux8:
name: Build AlmaLinux 8 RPMs
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream8
container: almalinux:8
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -56,10 +56,10 @@ jobs:
build/RPMS/noarch/glite-info-static-*-1.el8.noarch.rpm
build/SRPMS/glite-info-static-*-1.el8.src.rpm
centos9:
name: Build CentOS Stream 9 RPMs
almalinux9:
name: Build AlmaLinux 9 RPMs
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream9
container: almalinux:9
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -105,51 +105,51 @@ jobs:
${{ steps.package_name_centos7.outputs.src_path }}
release8:
name: Upload CentOS Stream 8 release artefacts
needs: centos8
name: Upload AlmaLinux 8 release artefacts
needs: almalinux8
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
with:
name: rpms8
- name: Find package name
id: package_name_centos8
id: package_name_almalinux8
run: |
rpm_path=$(find . -name 'glite-info-static-*-1.el8.noarch.rpm')
src_path=$(find . -name 'glite-info-static-*-1.el8.src.rpm')
echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT"
echo "src_path=${src_path}" >> "$GITHUB_OUTPUT"
- name: Attach CentOS Stream 8 RPMs to the release
- name: Attach AlmaLinux 8 RPMs to the release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
fail_on_unmatched_files: true
files: |
${{ steps.package_name_centos8.outputs.rpm_path }}
${{ steps.package_name_centos8.outputs.src_path }}
${{ steps.package_name_almalinux8.outputs.rpm_path }}
${{ steps.package_name_almalinux8.outputs.src_path }}
release9:
name: Upload CentOS Stream 9 release artefacts
needs: centos9
name: Upload AlmaLinux 9 release artefacts
needs: almalinux9
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
with:
name: rpms9
- name: Find package name
id: package_name_centos9
id: package_name_almalinux9
run: |
rpm_path=$(find . -name 'glite-info-static-*-1.el9.noarch.rpm')
src_path=$(find . -name 'glite-info-static-*-1.el9.src.rpm')
echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT"
echo "src_path=${src_path}" >> "$GITHUB_OUTPUT"
- name: Attach CentOS Stream 9 RPMs to the release
- name: Attach AlmaLinux 9 RPMs to the release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
fail_on_unmatched_files: true
files: |
${{ steps.package_name_centos9.outputs.rpm_path }}
${{ steps.package_name_centos9.outputs.src_path }}
${{ steps.package_name_almalinux9.outputs.rpm_path }}
${{ steps.package_name_almalinux9.outputs.src_path }}
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
cd tests/
./run-tests.sh
# Use a matrix for CentOS Stream versions
# Use a matrix for AlmaLinux versions
test:
strategy:
matrix:
centos-version: [8, 9]
name: Run tests on CentOS ${{ matrix.centos-version }}
almalinux-version: [8, 9]
name: Run tests on AlmaLinux ${{ matrix.almalinux-version }}
runs-on: ubuntu-latest
container: quay.io/centos/centos:stream${{ matrix.centos-version }}
container: almalinux:${{ matrix.almalinux-version }}
steps:
- uses: actions/checkout@v3
with:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ and this project adheres to

## [Unreleased]

## [0.3.1] - 2023-03-17

### Changed

- Build and release packages using AlmaLinux 8 and 9. (#9) (Baptiste Grenier)

## [0.3.0] - 2023-06-10

### Changed
Expand Down
5 changes: 4 additions & 1 deletion glite-info-static.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: glite-info-static
Version: 0.3.0
Version: 0.3.1
Release: 1%{?dist}
Summary: Core component for the static information framework
Group: System/Monitoring
Expand Down Expand Up @@ -42,6 +42,9 @@ rm -rf %{buildroot}
%license /usr/share/licenses/%{name}-%{version}/LICENSE.txt

%changelog
* Fri Mar 17 2023 Baptiste Grenier <baptiste.grenier@egi.eu> - 0.3.0-1
- Build and release packages using AlmaLinux 8 and 9. (#9) (Baptiste Grenier)

* Fri Mar 10 2023 Baptiste Grenier <baptiste.grenier@egi.eu> - 0.3.0-1
- Python 3 support (#6) (Baptiste Grenier)
- Replace getopt by argparse (#7) (Enol Fernandez)
Expand Down

0 comments on commit af00062

Please sign in to comment.