diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ce6f6a..b5b93e5 100644 --- 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 index 2e3ca40..09df06a 100644 --- 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 index 395bb39..b2de617 100644 --- 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 index 7cbddb5..cfed60d 100644 --- 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 index d450a67..4b1fa25 100644 --- 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 index e98befb..b63e28c 100644 --- 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 index 623525f..1e76c38 100644 --- 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 index 89dd0c3..79c6558 100644 --- 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 index b07adad..2c19c76 100644 --- 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 index 071dfbe..d13f31f 100644 --- 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 index 75edc9e..d6cd597 100644 --- 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 index b117b57..2d47681 100644 --- 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 index cf246d8..97bfdc9 100644 --- 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 index ccdadea..93e6287 100644 --- 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 index a0281a4..72dd155 100644 --- 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 index 0289fd2..0e64a94 100644 --- 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 index 3a95960..97a1aa5 100644 --- 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() diff --git a/cmake/packaging/sensu-cli/arm64.cmake b/cmake/packaging/sensu-cli/arm64.cmake index 791ead1..34ef7cc 100644 --- a/cmake/packaging/sensu-cli/arm64.cmake +++ b/cmake/packaging/sensu-cli/arm64.cmake @@ -15,7 +15,11 @@ function(build_sensu_cli_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_cli_settings() @@ -38,11 +42,14 @@ function(build_sensu_cli_linux_arm64_deb_package) "ubuntu/bionic" "ubuntu/focal" "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_cli_settings() diff --git a/cmake/packaging/sensu-cli/arm_5.cmake b/cmake/packaging/sensu-cli/arm_5.cmake index 626b81d..f6acdb7 100644 --- a/cmake/packaging/sensu-cli/arm_5.cmake +++ b/cmake/packaging/sensu-cli/arm_5.cmake @@ -17,7 +17,9 @@ function(build_sensu_cli_linux_arm_5_deb_package) "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/arm_6.cmake b/cmake/packaging/sensu-cli/arm_6.cmake index 0a28b9e..0b48ac2 100644 --- a/cmake/packaging/sensu-cli/arm_6.cmake +++ b/cmake/packaging/sensu-cli/arm_6.cmake @@ -18,7 +18,8 @@ function(build_sensu_cli_linux_arm_6_deb_package) "raspbian/jessie" "raspbian/stretch" "raspbian/buster" - "raspbian/bullseye") + "raspbian/bullseye" + "debian/trixie") set_common_settings() set_sensu_cli_settings() diff --git a/cmake/packaging/sensu-cli/arm_7.cmake b/cmake/packaging/sensu-cli/arm_7.cmake index ce70928..6e0e421 100644 --- a/cmake/packaging/sensu-cli/arm_7.cmake +++ b/cmake/packaging/sensu-cli/arm_7.cmake @@ -13,7 +13,11 @@ function(build_sensu_cli_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_cli_settings() @@ -38,10 +42,13 @@ function(build_sensu_cli_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_cli_settings() diff --git a/cmake/packaging/sensu-cli/mips64le_hardfloat.cmake b/cmake/packaging/sensu-cli/mips64le_hardfloat.cmake index a05097a..bf57e7b 100644 --- a/cmake/packaging/sensu-cli/mips64le_hardfloat.cmake +++ b/cmake/packaging/sensu-cli/mips64le_hardfloat.cmake @@ -16,7 +16,9 @@ function(build_sensu_cli_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_cli_settings() diff --git a/cmake/packaging/sensu-cli/mips_hardfloat.cmake b/cmake/packaging/sensu-cli/mips_hardfloat.cmake index 70c7ead..5fd80f9 100644 --- a/cmake/packaging/sensu-cli/mips_hardfloat.cmake +++ b/cmake/packaging/sensu-cli/mips_hardfloat.cmake @@ -16,7 +16,9 @@ function(build_sensu_cli_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_cli_settings() diff --git a/cmake/packaging/sensu-cli/mipsle_hardfloat.cmake b/cmake/packaging/sensu-cli/mipsle_hardfloat.cmake index 2432102..0d8dac9 100644 --- a/cmake/packaging/sensu-cli/mipsle_hardfloat.cmake +++ b/cmake/packaging/sensu-cli/mipsle_hardfloat.cmake @@ -17,7 +17,9 @@ function(build_sensu_cli_linux_mipsle_hardfloat_deb_package) "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/ppc64le.cmake b/cmake/packaging/sensu-cli/ppc64le.cmake index fb949a3..c21cb8e 100644 --- a/cmake/packaging/sensu-cli/ppc64le.cmake +++ b/cmake/packaging/sensu-cli/ppc64le.cmake @@ -9,7 +9,11 @@ function(build_sensu_cli_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_cli_settings() @@ -33,10 +37,13 @@ function(build_sensu_cli_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_cli_settings() diff --git a/cmake/packaging/sensu-cli/s390x.cmake b/cmake/packaging/sensu-cli/s390x.cmake index f96cd72..707ffba 100644 --- a/cmake/packaging/sensu-cli/s390x.cmake +++ b/cmake/packaging/sensu-cli/s390x.cmake @@ -11,7 +11,11 @@ function(build_sensu_cli_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_cli_settings() @@ -34,10 +38,13 @@ function(build_sensu_cli_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_cli_settings() diff --git a/scripts/find-branch-workflow.sh b/scripts/find-branch-workflow.sh index 801d942..abab912 100755 --- a/scripts/find-branch-workflow.sh +++ b/scripts/find-branch-workflow.sh @@ -16,7 +16,7 @@ if [ "x${targetBranch}" = "x" ]; then fi apiURL="https://circleci.com/api/v2" -slug="gh/sensu/sensu-go-extras" +slug="gh/sensu/sensu-enterprise-go" targetWorkflow="" nextPageToken="" page=1