added zabbix api_version()

HenriWahl · Mar 26, 2024 · ad0395b · ad0395b
1 parent e505097
commit ad0395b
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 4 deletions.
diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml
@@ -157,6 +157,28 @@ jobs:
           retention-days: 1
           if-no-files-found: error
 
+  fedora-41:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v3
+      # docker login is needed for pushing the build image
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      # if image defined by variable cr_image_version is not pullable aka does not exist it will be created and pushed
+      - run: docker pull ${{ env.cr_image }}-${{ github.job }}:${{ env.cr_image_version }} || /usr/bin/docker build -t ${{ env.cr_image }}-${{ github.job }}:${{ env.cr_image_version }} -f build/docker/Dockerfile-${{ github.job }} .
+      - run: docker push ${{ env.cr_image }}-${{ github.job }}:${{ env.cr_image_version }}
+      # building in precompiled image makes them way faster instead of creating the build environment every time from scratch
+      - run: /usr/bin/docker run -v ${{ github.workspace }}:/nagstamon ${{ env.cr_image }}-${{ github.job }}:${{ env.cr_image_version }}
+      - uses: actions/upload-artifact@v3
+        with:
+          path: build/*.rpm
+          retention-days: 1
+          if-no-files-found: error
+
   rhel-9:
     runs-on: ubuntu-latest
     needs: test
@@ -277,7 +299,7 @@ jobs:
   repo-debian:
     runs-on: ubuntu-latest
     # try to avoid race condition and start uploading only after the last install package has been build
-    needs: [debian, fedora-37, fedora-38, fedora-39, fedora-40, rhel-9, macos, windows-32, windows-64, windows-64-debug]
+    needs: [debian, fedora-37, fedora-38, fedora-39, fedora-40, fedora-41, rhel-9, macos, windows-32, windows-64, windows-64-debug]
     env:
       family: debian
     steps:

diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -131,7 +131,7 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '3.15-20240322'
+    VERSION = '3.15-20240326'
     WEBSITE = 'https://nagstamon.de'
     COPYRIGHT = '©2008-2024 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,7 +1,7 @@
-nagstamon (3.15-20240322) unstable; urgency=low
+nagstamon (3.15-20240326) unstable; urgency=low
   * New upstream
 
- -- Henri Wahl <[email protected]> Fri, Mar 22 2024 08:00:00 +0200
+ -- Henri Wahl <[email protected]> Tue, Mar 26 2024 08:00:00 +0200
 
 nagstamon (3.14.0) stable; urgency=low
   * New upstream

diff --git a/build/docker/Dockerfile-fedora-41 b/build/docker/Dockerfile-fedora-41
@@ -0,0 +1,28 @@
+FROM fedora:41
+LABEL [email protected]
+
+RUN dnf -y upgrade
+
+RUN dnf -y install createrepo_c \
+                   desktop-file-utils \
+                   git \
+                   python3 \
+                   python3-beautifulsoup4 \
+                   python3-cryptography \
+                   python3-dateutil \
+                   python3-devel \
+                   python3-keyring \
+                   python3-lxml \
+                   python3-psutil \
+                   python3-pyqt6 \
+                   python3-pyqt6-devel \
+                   python3-requests \
+                   python3-requests-kerberos \
+                   python3-SecretStorage \
+                   python3-setuptools \
+                   qt6-qtsvg \
+                   qt6-qtmultimedia \
+                   rpm-build
+
+CMD cd /nagstamon/build && \
+    /usr/bin/python3 build.py