Merge pull request #31 from sensu/ubuntu-24lts-support

Ubuntu 24lts support
sensu · Jul 21, 2024 · 39c286a · 39c286a
2 parents 3774630 + dae721a
commit 39c286a
Show file tree

Hide file tree

Showing 27 changed files with 165 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -342,7 +342,11 @@ commands:
             << parameters.source >>
             $TARGET_BRANCH
             $TARGET_REVISION
-
+  setup-wixtool-set:
+    steps:
+      - wixtoolset/download:
+          installer_url: https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe
+      - wixtoolset/install
 jobs:
   build-linux-packages:
     docker:
@@ -484,7 +488,7 @@ jobs:
       - verify-binary:
           working_directory: target/windows_amd64
           binary: << parameters.binary >>
-      - wixtoolset/download-and-install
+      - setup-wixtool-set
       - run: curl -LsO https://github.com/appveyor/secure-file/releases/download/1.0.1/secure-file.zip
       - run: unzip secure-file.zip
       - run:
@@ -496,9 +500,11 @@ jobs:
       - signtool/import-certificate:
           certificate: codesign-cert.p12
       - signtool/sign:
+          path: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe'
           working_directory: target/windows_386
           file: << parameters.binary >>
       - signtool/sign:
+          path: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe'
           working_directory: target/windows_amd64
           file: << parameters.binary >>
       - build-msi:
@@ -508,6 +514,7 @@ jobs:
           working_directory: wix/<< parameters.package_name >>
           arch: x64
       - signtool/sign:
+          path: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe'
           working_directory: dist/msi/en-US
           file: '*.msi'
       - run:

diff --git a/cmake/packaging/sensu-agent/386.cmake b/cmake/packaging/sensu-agent/386.cmake
@@ -28,10 +28,13 @@ function(build_sensu_agent_linux_386_deb_package)
         "ubuntu/xenial"
         "ubuntu/bionic"
         "ubuntu/focal"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/amd64.cmake b/cmake/packaging/sensu-agent/amd64.cmake
@@ -16,7 +16,11 @@ function(build_sensu_agent_linux_amd64_rpm_package)
         "fedora/33"
         "fedora/34"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_agent_settings()
@@ -40,10 +44,13 @@ function(build_sensu_agent_linux_amd64_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/arm64.cmake b/cmake/packaging/sensu-agent/arm64.cmake
@@ -15,7 +15,11 @@ function(build_sensu_agent_linux_arm64_rpm_package)
         "fedora/33"
         "fedora/34"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_agent_settings()
@@ -39,11 +43,14 @@ function(build_sensu_agent_linux_arm64_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
         "debian/bullseye"
-        "raspbian/bullseye")
+        "debian/bookworm"
+        "raspbian/bullseye"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/arm_5.cmake b/cmake/packaging/sensu-agent/arm_5.cmake
@@ -17,7 +17,9 @@ function(build_sensu_agent_linux_arm_5_deb_package)
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/arm_6.cmake b/cmake/packaging/sensu-agent/arm_6.cmake
@@ -18,7 +18,8 @@ function(build_sensu_agent_linux_arm_6_deb_package)
         "raspbian/jessie"
         "raspbian/stretch"
         "raspbian/buster"
-        "raspbian/bullseye")
+        "raspbian/bullseye"
+        "raspbian/bookworm")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/arm_7.cmake b/cmake/packaging/sensu-agent/arm_7.cmake
@@ -13,7 +13,11 @@ function(build_sensu_agent_linux_arm_7_rpm_package)
         "fedora/33"
         "fedora/34"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_agent_settings()
@@ -38,10 +42,13 @@ function(build_sensu_agent_linux_arm_7_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/mips64le_hardfloat.cmake b/cmake/packaging/sensu-agent/mips64le_hardfloat.cmake
@@ -16,7 +16,9 @@ function(build_sensu_agent_linux_mips64le_hardfloat_deb_package)
     set(PACKAGECLOUD_DISTROS
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/mips_hardfloat.cmake b/cmake/packaging/sensu-agent/mips_hardfloat.cmake
@@ -16,7 +16,9 @@ function(build_sensu_agent_linux_mips_hardfloat_deb_package)
     set(PACKAGECLOUD_DISTROS
         "debian/jessie"
         "debian/stretch"
-        "debian/buster")
+        "debian/buster"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/mipsle_hardfloat.cmake b/cmake/packaging/sensu-agent/mipsle_hardfloat.cmake
@@ -17,7 +17,9 @@ function(build_sensu_agent_linux_mipsle_hardfloat_deb_package)
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/ppc64le.cmake b/cmake/packaging/sensu-agent/ppc64le.cmake
@@ -9,7 +9,11 @@ function(build_sensu_agent_linux_ppc64le_rpm_package)
         "el/8"
         "el/9"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_agent_settings()
@@ -33,10 +37,13 @@ function(build_sensu_agent_linux_ppc64le_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-agent/s390x.cmake b/cmake/packaging/sensu-agent/s390x.cmake
@@ -11,7 +11,11 @@ function(build_sensu_agent_linux_s390x_rpm_package)
         "el/8"
         "el/9"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_agent_settings()
@@ -34,10 +38,13 @@ function(build_sensu_agent_linux_s390x_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_agent_settings()

diff --git a/cmake/packaging/sensu-backend/amd64.cmake b/cmake/packaging/sensu-backend/amd64.cmake
@@ -16,7 +16,11 @@ function(build_sensu_backend_linux_amd64_rpm_package)
         "fedora/33"
         "fedora/34"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_backend_settings()
@@ -40,10 +44,13 @@ function(build_sensu_backend_linux_amd64_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_backend_settings()

diff --git a/cmake/packaging/sensu-backend/arm64.cmake b/cmake/packaging/sensu-backend/arm64.cmake
@@ -15,7 +15,11 @@ function(build_sensu_backend_linux_arm64_rpm_package)
         "fedora/33"
         "fedora/34"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_backend_settings()
@@ -39,11 +43,14 @@ function(build_sensu_backend_linux_arm64_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
         "debian/bullseye"
-        "raspbian/bullseye")
+        "debian/bookworm"
+        "raspbian/bullseye"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_backend_settings()

diff --git a/cmake/packaging/sensu-backend/ppc64le.cmake b/cmake/packaging/sensu-backend/ppc64le.cmake
@@ -9,7 +9,11 @@ function(build_sensu_backend_linux_ppc64le_rpm_package)
         "el/8"
         "el/9"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_backend_settings()
@@ -33,10 +37,13 @@ function(build_sensu_backend_linux_ppc64le_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_backend_settings()

diff --git a/cmake/packaging/sensu-cli/386.cmake b/cmake/packaging/sensu-cli/386.cmake
@@ -28,10 +28,15 @@ function(build_sensu_cli_linux_386_deb_package)
         "ubuntu/xenial"
         "ubuntu/bionic"
         "ubuntu/focal"
+        "ubuntu/hirsute"
+        "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_cli_settings()

diff --git a/cmake/packaging/sensu-cli/amd64.cmake b/cmake/packaging/sensu-cli/amd64.cmake
@@ -16,7 +16,11 @@ function(build_sensu_cli_linux_amd64_rpm_package)
         "fedora/33"
         "fedora/34"
         "fedora/35"
-        "fedora/36")
+        "fedora/36"
+        "fedora/37"
+        "fedora/38"
+        "fedora/39"
+        "fedora/40")
 
     set_common_settings()
     set_sensu_cli_settings()
@@ -40,10 +44,13 @@ function(build_sensu_cli_linux_amd64_deb_package)
         "ubuntu/focal"
         "ubuntu/hirsute"
         "ubuntu/jammy"
+        "ubuntu/noble"
         "debian/jessie"
         "debian/stretch"
         "debian/buster"
-        "debian/bullseye")
+        "debian/bullseye"
+        "debian/bookworm"
+        "debian/trixie")
 
     set_common_settings()
     set_sensu_cli_settings()