tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10075 from Icinga/gha2143

Browse Source 
Update GitHub actions
This commit is contained in:
Alexander Aleksandrovič Klimov 2024-06-10 10:59:37 +02:00 committed by GitHub
commit 62a92c10b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/authors-file.yml vendored
View File

@ -20,8 +20,8 @@ jobs:
sort -uo AUTHORS AUTHORS sort -uo AUTHORS AUTHORS
git add AUTHORS git add AUTHORS
git log --format='format:%aN <%aE>' "$( git log --format='format:%aN <%aE>' "$(
git merge-base "origin/$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF" git merge-base HEAD^1 HEAD^2
)..origin/$GITHUB_HEAD_REF" >> AUTHORS )..HEAD^2" >> AUTHORS
sort -uo AUTHORS AUTHORS sort -uo AUTHORS AUTHORS
git diff AUTHORS >> AUTHORS.diff git diff AUTHORS >> AUTHORS.diff

1
.github/workflows/docker.yml vendored
View File

@ -5,7 +5,6 @@ on:
push: push:
branches: branches:
- master - master
- 'support/*'
release: release:
types: types:
- published - published

3
.github/workflows/linux.yml vendored
View File

@ -24,12 +24,12 @@ jobs:
- amazonlinux:2 - amazonlinux:2
- amazonlinux:2023 - amazonlinux:2023
- centos:7 # and RHEL 7 - centos:7 # and RHEL 7
- debian:10
- debian:11 # and Raspbian 11 - debian:11 # and Raspbian 11
- debian:12 # and Raspbian 12 - debian:12 # and Raspbian 12
- fedora:37 - fedora:37
- fedora:38 - fedora:38
- fedora:39 - fedora:39
- fedora:40
- opensuse/leap:15.3 # SLES 15.3 - opensuse/leap:15.3 # SLES 15.3
- opensuse/leap:15.4 # and SLES 15.4 - opensuse/leap:15.4 # and SLES 15.4
- opensuse/leap:15.5 # and SLES 15.5 - opensuse/leap:15.5 # and SLES 15.5
@ -39,6 +39,7 @@ jobs:
- ubuntu:22.04 - ubuntu:22.04
- ubuntu:23.04 - ubuntu:23.04
- ubuntu:23.10 - ubuntu:23.10
- ubuntu:24.04
steps: steps:
- name: Checkout HEAD - name: Checkout HEAD

1
CMakeLists.txt
View File

@ -506,6 +506,7 @@ set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/dlgbmp.bmp
set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.Debug") set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.Debug")
set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch") set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch")
set(CPACK_WIX_EXTENSIONS "WixUtilExtension" "WixNetFxExtension") set(CPACK_WIX_EXTENSIONS "WixUtilExtension" "WixNetFxExtension")
set(CPACK_WIX_INSTALL_SCOPE NONE)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "sbin") set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "sbin")
set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)