diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2ae922..207c1e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,30 +5,6 @@ on: pull_request: jobs: - # XXX done outside of the matrix due to different container name - build-centos7: - name: Build CentOS 7 RPMs - runs-on: ubuntu-latest - container: quay.io/centos/centos:7 - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Install build requisites - run: | - yum install -y rpm-build yum-utils rpmlint - yum-builddep -y glite-info-provider-ldap.spec - - name: build rpm - run: | - make clean rpm - rpmlint --file .rpmlint.ini build/RPMS/noarch/*.el7.noarch.rpm - - name: Upload RPMs - uses: actions/upload-artifact@v3 - with: - name: rpms7 - path: | - build/RPMS/noarch/glite-info-provider-ldap-*.el7.noarch.rpm - # Use a matrix for AlmaLinux versions build-almalinux: strategy: @@ -56,21 +32,6 @@ jobs: path: | build/RPMS/noarch/glite-info-provider-ldap-*.el${{ matrix.almalinux-version }}.noarch.rpm - # XXX: From EPEL: openldap-servers - install-centos7: - name: Install CentOS 7 RPMs - needs: build-centos7 - runs-on: ubuntu-latest - container: quay.io/centos/centos:7 - steps: - - uses: actions/download-artifact@v3 - with: - name: rpms7 - - name: Install generated RPMs - run: | - yum install -y epel-release - yum localinstall -y glite-info-provider-ldap-*.el7.noarch.rpm - # XXX: From PowerTools: openldap-servers install-almalinux8: name: Install AlmaLinux 8 RPMs @@ -86,6 +47,9 @@ jobs: yum install -y dnf-plugins-core dnf config-manager --set-enabled powertools yum localinstall -y glite-info-provider-ldap-*.el8.noarch.rpm + - name: Call script, check usage is shown + run: | + /usr/libexec/glite-info-provider-ldap -h 2>&1 | grep -q '^Usage: /usr/libexec/glite-info-provider-ldap' # XXX Dependencies from EPEL: openldap-servers install-almalinux9: @@ -101,3 +65,6 @@ jobs: run: | yum install -y epel-release yum localinstall -y glite-info-provider-ldap-*.el9.noarch.rpm + - name: Call script, check usage is shown + run: | + /usr/libexec/glite-info-provider-ldap -h 2>&1 | grep -q '^Usage: /usr/libexec/glite-info-provider-ldap' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb5d719..6e8e4c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,29 +10,6 @@ on: - "v*" jobs: - centos7: - name: Build centOS 7 RPMs - runs-on: ubuntu-latest - container: quay.io/centos/centos:7 - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: install build requisites - run: | - yum install -y rpm-build yum-utils - yum-builddep -y glite-info-provider-ldap.spec - - name: build rpm - run: | - make clean rpm - - name: Upload RPMs - uses: actions/upload-artifact@v3 - with: - name: rpms7 - path: | - build/RPMS/noarch/glite-info-provider-ldap-*.el7.noarch.rpm - build/SRPMS/glite-info-provider-ldap-*.el7.src.rpm - almalinux8: name: Build AlmaLinux 8 RPMs runs-on: ubuntu-latest @@ -79,33 +56,6 @@ jobs: build/RPMS/noarch/glite-info-provider-ldap-*.el9.noarch.rpm build/SRPMS/glite-info-provider-ldap-*.el9.src.rpm - release7: - name: Upload CentOS 7 release artefacts - permissions: - contents: write # to upload release asset (softprops/action-gh-release) - needs: centos7 - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v3 - with: - name: rpms7 - - name: Find package name - id: package_name_centos7 - run: | - rpm_path=$(find . -name 'glite-info-provider-ldap-*.el7.noarch.rpm') - src_path=$(find . -name 'glite-info-provider-ldap-*.el7.src.rpm') - echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT" - echo "src_path=${src_path}" >> "$GITHUB_OUTPUT" - - name: Attach CentOS 7 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_centos7.outputs.rpm_path }} - ${{ steps.package_name_centos7.outputs.src_path }} - release8: name: Upload AlmaLinux 8 release artefacts permissions: diff --git a/CHANGELOG b/CHANGELOG index a598b1e..2ccb9b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,13 @@ and this project adheres to ## [Unreleased] +## [1.7.1] - 2024-11-15 + +### Added + +- Drop support for RHEL7. (#21) (Baptiste Grenier) +- Add missing perl dependencies for EL8. (#21) (Baptiste Grenier) + ## [1.6.1] - 2024-06-28 ### Added diff --git a/glite-info-provider-ldap.spec b/glite-info-provider-ldap.spec index 8ce5e56..fbfbe3f 100644 --- a/glite-info-provider-ldap.spec +++ b/glite-info-provider-ldap.spec @@ -1,5 +1,5 @@ Name: glite-info-provider-ldap -Version: 1.6.1 +Version: 1.7.1 Release: 1%{?dist} Summary: LDAP information provider Group: Development/Libraries @@ -11,9 +11,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rsync BuildRequires: make Requires: openldap-servers +Requires: perl-libwww-perl %if 0%{?rhel} >= 9 -Requires: perl-File-Copy -Requires: perl-libwww-perl +Requires: perl-File-Copy %endif %description @@ -44,8 +44,12 @@ rm -rf %{buildroot} %license /usr/share/licenses/%{name}-%{version}/LICENSE.txt %changelog -* Tue Apr 28 2024 Baptiste Grenier - 1.6.1-1 -- Add missing perl dependencies for EL9. (#16) (Baptiste Grenier) +* Thu Nov 15 2024 baptiste grenier - 1.7.1-1 +- Drop support for RHEL7. (#21) (baptiste grenier) +- Add missing perl dependencies for el8. (#21) (baptiste grenier) + +* Tue Apr 28 2024 baptiste grenier - 1.6.1-1 +- Add missing perl dependencies for el9. (#16) (baptiste grenier) * Tue Apr 4 2023 Baptiste Grenier - 1.6.0-1 - Build and release using CentOS 7, AlmaLinux 8 and 9. (#12) (Baptiste Grenier)