Pre-release updates

* update github workflows to use newer versions of actions * stop packaging for centos 7 * start packaging for ubuntu 24.04 * update release dates in changelogs
salcock · May 8, 2024 · d3098ba · d3098ba
1 parent ca85e0c
commit d3098ba
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/pkg-build.yaml b/.github/workflows/pkg-build.yaml
@@ -19,12 +19,13 @@ jobs:
            - "debian:bookworm"
            - "debian:buster"
            - "debian:bullseye"
+           - "ubuntu:noble"
            - "ubuntu:focal"
            - "ubuntu:jammy"
 
      steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install prereq packages
         run: ./debpkg-setup.sh
       - name: Build packages
@@ -36,7 +37,7 @@ jobs:
           mkdir -p packages/${DIRNAME}
           cp ../*.deb packages/${DIRNAME}/
       - name: Store packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packages-${{ env.DIRNAME }}
           path: packages/${{ env.DIRNAME }}/*.deb
@@ -56,13 +57,14 @@ jobs:
            - "debian:bullseye"
            - "ubuntu:focal"
            - "ubuntu:jammy"
+           - "ubuntu:noble"
            - "debian:bookworm"
      needs: build
      steps:
        - name: Set environment variables for download
          run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
        - name: Download artifact
-         uses: actions/download-artifact@v3
+         uses: actions/download-artifact@v4
          with:
            name: packages-${{ env.DIRNAME }}
        - name: Add repositories
@@ -98,20 +100,21 @@ jobs:
            - "debian:bookworm"
            - "ubuntu:focal"
            - "ubuntu:jammy"
+           - "ubuntu:noble"
      needs: test
      steps:
        - name: Set environment variables for download
          run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
        - name: Download artifact
-         uses: actions/download-artifact@v3
+         uses: actions/download-artifact@v4
          with:
            name: packages-${{ env.DIRNAME }}
        - name: Copy packages
          run: |
            mkdir -p packages/${DIRNAME}
            find . -name "*.deb" | xargs cp -t packages/${DIRNAME}/
        - name: Publish package to cloudsmith
-         uses: wanduow/action-cloudsmith-upload-packages@v1
+         uses: salcock/action-cloudsmith-upload-packages@v1.8
          with:
            path: packages/
            repo: ${{ secrets.CLOUDSMITH_OWNER }}/libtrace

diff --git a/.github/workflows/rpm-build.yaml b/.github/workflows/rpm-build.yaml
@@ -20,11 +20,10 @@ jobs:
            - "rockylinux:9"
            - "fedora:39"
            - "fedora:38"
-           - "centos:7"
 
      steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install prereq packages
         run: ./rpmpkg-setup.sh ${{ matrix.target }}
       - name: Build packages
@@ -36,7 +35,7 @@ jobs:
           mkdir -p packages/${DIRNAME}
           cp ~/rpmbuild/RPMS/x86_64/*.rpm packages/${DIRNAME}/
       - name: Store packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packages-${{ env.DIRNAME }}
           path: packages/${{ env.DIRNAME }}/*.rpm
@@ -56,13 +55,12 @@ jobs:
            - "rockylinux:9"
            - "fedora:39"
            - "fedora:38"
-           - "centos:7"
      needs: build
      steps:
        - name: Set environment variables for download
          run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
        - name: Download artifact
-         uses: actions/download-artifact@v3
+         uses: actions/download-artifact@v4
          with:
            name: packages-${{ env.DIRNAME }}
        - name: Add repositories
@@ -71,9 +69,6 @@ jobs:
          run: |
            curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandio/cfg/setup/bash.rpm.sh' | bash
            curl -1sLf 'https://dl.cloudsmith.io/public/wand/libwandder/cfg/setup/bash.rpm.sh' | bash
-           if [ "${TARGET}" == "centos:7" ]; then
-               yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm || true
-           fi
            if [[ "${TARGET}" =~ rocky* ]]; then
                dnf install -y dnf-plugins-core epel-release || true
                dnf config-manager --set-enabled powertools || true
@@ -112,7 +107,7 @@ jobs:
        - name: Set environment variables for download
          run: echo DIRNAME=${{ matrix.target }} | tr ':' '_' >> $GITHUB_ENV
        - name: Download artifact
-         uses: actions/download-artifact@v3
+         uses: actions/download-artifact@v4
          with:
            name: packages-${{ env.DIRNAME }}
        - name: Copy packages
@@ -121,7 +116,7 @@ jobs:
            yum install -y findutils
            find . -name "*.rpm" | xargs cp -t packages/${DIRNAME}/
        - name: Publish package to cloudsmith
-         uses: wanduow/action-cloudsmith-upload-packages@v1
+         uses: salcock/action-cloudsmith-upload-packages@v1.8
          with:
            path: packages/
            repo: ${{ secrets.CLOUDSMITH_OWNER }}/libtrace

diff --git a/README b/README
@@ -1,7 +1,7 @@
 libtrace 4.0.25
 
 Code and documentation added since version 4.0.20 is
-Copyright (c) 2023 Shane Alcock and has been contributed as per
+Copyright (c) 2023-2024 Shane Alcock and has been contributed as per
 the terms of the GNU Lesser General Public License version 3.
 All rights reserved.
 

diff --git a/debian/changelog b/debian/changelog
@@ -3,7 +3,7 @@ libtrace4 (4.0.25-1) unstable; urgency=medium
   * ndag: fix issue where the most recently received packets may not
     be delivered to libtrace if the multicast source stops sending.
 
- -- Shane Alcock <[email protected]>  Fri, 19 Apr 2024 15:42:19 +1200
+ -- Shane Alcock <[email protected]>  Thu, 9 May 2024 10:16:36 +1200
 
 libtrace4 (4.0.24-1) unstable; urgency=medium
 

diff --git a/rpm/libtrace4.spec b/rpm/libtrace4.spec
@@ -127,7 +127,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
-* Fri Apr 19 2024 Shane Alcock <[email protected]> - 4.0.25-1
+* Thu May 9 2024 Shane Alcock <[email protected]> - 4.0.25-1
 - Updated for 4.0.25 release
 
 * Wed Jan 24 2024 Shane Alcock <[email protected]> - 4.0.24-1