diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d1500c01f..8b11de5a1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,80 +11,80 @@ concurrency: group: linux-${{ github.event_name == 'push' && github.sha || github.ref }} cancel-in-progress: true -jobs: - linux: - name: ${{ matrix.distro }}${{ matrix.platform != 'linux/amd64' && format(' ({0})', matrix.platform) || '' }} - runs-on: ubuntu-latest +# jobs: +# linux: +# name: ${{ matrix.distro }}${{ matrix.platform != 'linux/amd64' && format(' ({0})', matrix.platform) || '' }} +# runs-on: ubuntu-latest - strategy: - fail-fast: false - max-parallel: 2 - matrix: - distro: - # Alpine Linux to build Icinga 2 with LibreSSL, OpenBSD's default. - # The "alpine:bash" image will be built below based on "alpine:3". - - alpine:bash +# strategy: +# fail-fast: false +# max-parallel: 2 +# matrix: +# distro: +# # Alpine Linux to build Icinga 2 with LibreSSL, OpenBSD's default. +# # The "alpine:bash" image will be built below based on "alpine:3". +# - alpine:bash - - amazonlinux:2 - - amazonlinux:2023 +# - amazonlinux:2 +# - amazonlinux:2023 - # Raspberry Pi OS is close enough to Debian to test just one of them. - # Its architecture is different, though, and covered by the Docker job. - - debian:11 - - debian:12 - - debian:13 +# # Raspberry Pi OS is close enough to Debian to test just one of them. +# # Its architecture is different, though, and covered by the Docker job. +# - debian:11 +# - debian:12 +# - debian:13 - - fedora:41 - - fedora:42 - - fedora:43 +# - fedora:41 +# - fedora:42 +# - fedora:43 - - opensuse/leap:15.6 - - opensuse/leap:16.0 +# - opensuse/leap:15.6 +# - opensuse/leap:16.0 - # We don't actually support Rocky Linux as such! - # We just use that RHEL clone to test the original. - - rockylinux:8 - - rockylinux:9 - - rockylinux/rockylinux:10 +# # We don't actually support Rocky Linux as such! +# # We just use that RHEL clone to test the original. +# - rockylinux:8 +# - rockylinux:9 +# - rockylinux/rockylinux:10 - - registry.suse.com/suse/sle15:15.6 - - registry.suse.com/suse/sle15:15.7 - - registry.suse.com/bci/bci-base:16.0 +# - registry.suse.com/suse/sle15:15.6 +# - registry.suse.com/suse/sle15:15.7 +# - registry.suse.com/bci/bci-base:16.0 - - ubuntu:22.04 - - ubuntu:24.04 - - ubuntu:25.04 - - ubuntu:25.10 +# - ubuntu:22.04 +# - ubuntu:24.04 +# - ubuntu:25.04 +# - ubuntu:25.10 - platform: - - linux/amd64 +# platform: +# - linux/amd64 - include: - - distro: debian:11 - platform: linux/386 - - distro: debian:12 - platform: linux/386 +# include: +# - distro: debian:11 +# platform: linux/386 +# - distro: debian:12 +# platform: linux/386 - steps: - - name: Checkout HEAD - uses: actions/checkout@v6 +# steps: +# - name: Checkout HEAD +# uses: actions/checkout@v6 - - name: Turn on Problem Matcher - run: echo "::add-matcher::.github/problem-matchers/gcc.json" +# - name: Turn on Problem Matcher +# run: echo "::add-matcher::.github/problem-matchers/gcc.json" - - name: Restore/backup ccache - uses: actions/cache@v5 - with: - path: ccache - key: ccache/${{ matrix.distro }} +# - name: Restore/backup ccache +# uses: actions/cache@v5 +# with: +# path: ccache +# key: ccache/${{ matrix.distro }} - - name: Build Alpine Docker Image - if: "matrix.distro == 'alpine:bash'" - run: >- - docker build --file .github/workflows/alpine-bash.Dockerfile - --tag alpine:bash `mktemp -d` +# - name: Build Alpine Docker Image +# if: "matrix.distro == 'alpine:bash'" +# run: >- +# docker build --file .github/workflows/alpine-bash.Dockerfile +# --tag alpine:bash `mktemp -d` - - name: Build Icinga - run: >- - docker run --rm -v "$(pwd):/icinga2" -e DISTRO=${{ matrix.distro }} - --platform ${{ matrix.platform }} ${{ matrix.distro }} /icinga2/.github/workflows/linux.bash +# - name: Build Icinga +# run: >- +# docker run --rm -v "$(pwd):/icinga2" -e DISTRO=${{ matrix.distro }} +# --platform ${{ matrix.platform }} ${{ matrix.distro }} /icinga2/.github/workflows/linux.bash diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a2c91eb00..c854c3b3f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,53 +11,53 @@ concurrency: group: windows-${{ github.event_name == 'push' && github.sha || github.ref }} cancel-in-progress: true -jobs: - windows: - name: Windows +# jobs: +# windows: +# name: Windows - strategy: - fail-fast: false - max-parallel: 1 - matrix: - bits: [32, 64] +# strategy: +# fail-fast: false +# max-parallel: 1 +# matrix: +# bits: [32, 64] - runs-on: windows-2025 +# runs-on: windows-2025 - env: - BITS: '${{ matrix.bits }}' - CMAKE_BUILD_TYPE: RelWithDebInfo +# env: +# BITS: '${{ matrix.bits }}' +# CMAKE_BUILD_TYPE: RelWithDebInfo - steps: - - name: Checkout HEAD - uses: actions/checkout@v6 - with: - fetch-depth: 0 +# steps: +# - name: Checkout HEAD +# uses: actions/checkout@v6 +# with: +# fetch-depth: 0 - - name: Build tools - run: | - Set-PSDebug -Trace 1 - & .\doc\win-dev.ps1 +# - name: Build tools +# run: | +# Set-PSDebug -Trace 1 +# & .\doc\win-dev.ps1 - - name: Turn on Problem Matcher - run: | - Write-Host "::add-matcher::.github/problem-matchers/msvc.json" +# - name: Turn on Problem Matcher +# run: | +# Write-Host "::add-matcher::.github/problem-matchers/msvc.json" - - name: Binary - run: | - Set-PSDebug -Trace 1 - & .\tools\win32\load-vsenv.ps1 - & powershell.exe .\tools\win32\configure.ps1 - if ($LastExitCode -ne 0) { throw "Error during configure" } - & powershell.exe .\tools\win32\build.ps1 - if ($LastExitCode -ne 0) { throw "Error during build" } - & powershell.exe .\tools\win32\test.ps1 - if ($LastExitCode -ne 0) { throw "Error during test" } +# - name: Binary +# run: | +# Set-PSDebug -Trace 1 +# & .\tools\win32\load-vsenv.ps1 +# & powershell.exe .\tools\win32\configure.ps1 +# if ($LastExitCode -ne 0) { throw "Error during configure" } +# & powershell.exe .\tools\win32\build.ps1 +# if ($LastExitCode -ne 0) { throw "Error during build" } +# & powershell.exe .\tools\win32\test.ps1 +# if ($LastExitCode -ne 0) { throw "Error during test" } - - name: Show Log Files - if: ${{ always() }} - run: | - foreach ($file in Get-ChildItem -Recurse -Filter "*.log") { - Write-Host "::group::$($file.FullName)" - Get-Content $file.FullName - Write-Host "::endgroup::" - } +# - name: Show Log Files +# if: ${{ always() }} +# run: | +# foreach ($file in Get-ChildItem -Recurse -Filter "*.log") { +# Write-Host "::group::$($file.FullName)" +# Get-Content $file.FullName +# Write-Host "::endgroup::" +# } diff --git a/test/perfdata-perfdatawriterconnection.cpp b/test/perfdata-perfdatawriterconnection.cpp index d689fbf63..4b6c9f1fc 100644 --- a/test/perfdata-perfdatawriterconnection.cpp +++ b/test/perfdata-perfdatawriterconnection.cpp @@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(stuck_sending) std::this_thread::sleep_for(10ms); } - GetConnection().StartDisconnectTimeout(50ms); + GetConnection().StartDisconnectTimeout(1s); }}; // Allocate a large string that will fill the buffers on both sides of the connection, in