From 19927d004364fbad6a3500136393394615f89c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 26 Sep 2023 11:40:28 +0200 Subject: [PATCH 1/8] GHA: drop EOL Ubuntu 22.10 --- .github/workflows/linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index be238b170c9..108791f057c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -37,7 +37,6 @@ jobs: - rockylinux:9 # RHEL 9 - ubuntu:20.04 - ubuntu:22.04 - - ubuntu:22.10 - ubuntu:23.04 steps: From 1f4ac7e651ec388106c6ce3bfa67d03655ae505f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Wed, 4 Oct 2023 16:35:26 +0200 Subject: [PATCH 2/8] GHA: add upcoming (already frozen) Fedora 39 --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 108791f057c..7cd24dd9279 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,6 +30,7 @@ jobs: - fedora:36 - fedora:37 - fedora:38 + - fedora:39 - opensuse/leap:15.3 # SLES 15.3 - opensuse/leap:15.4 # and SLES 15.4 - opensuse/leap:15.5 # and SLES 15.5 From 35ef622cc6ecc85d0eea09e0dcb2c751936c4b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Fri, 6 Oct 2023 10:34:36 +0200 Subject: [PATCH 3/8] GHA: add upcoming (already frozen) Ubuntu 23.10 --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7cd24dd9279..7a51d67ae04 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,6 +39,7 @@ jobs: - ubuntu:20.04 - ubuntu:22.04 - ubuntu:23.04 + - ubuntu:23.10 steps: - name: Checkout HEAD From 3801b8a7cbffaba8a7ecc7dcda84f4098f62390a Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 17 Nov 2023 15:54:03 +0100 Subject: [PATCH 4/8] GHA: cancel runs on PR, but not on push In a PR one top commit replaces the previous one. But the central branches are more like timelines. It's nice to have red crosses in a such timeline as clear indicators that something was actually broken. --- .github/workflows/docker.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/rpm.yml | 2 +- .github/workflows/windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d4883b5d0c9..dc23459e04e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ on: - published concurrency: - group: docker-${{ github.ref }} + group: docker-${{ github.event_name == 'push' && github.sha || github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7a51d67ae04..8f5ff033b3e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -8,7 +8,7 @@ on: pull_request: {} concurrency: - group: linux-${{ github.ref }} + group: linux-${{ github.event_name == 'push' && github.sha || github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml index 13022168e56..5cf8b10b068 100644 --- a/.github/workflows/rpm.yml +++ b/.github/workflows/rpm.yml @@ -8,7 +8,7 @@ on: pull_request: {} concurrency: - group: rpm-${{ github.ref }} + group: rpm-${{ github.event_name == 'push' && github.sha || github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 52a08fce8e8..18d8e5757b2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,7 +8,7 @@ on: pull_request: {} concurrency: - group: windows-${{ github.ref }} + group: windows-${{ github.event_name == 'push' && github.sha || github.ref }} cancel-in-progress: true jobs: From de4787899140a20e4a27a634f1b7ba2fc70d9720 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 20 Nov 2023 15:41:14 +0100 Subject: [PATCH 5/8] GHA: complain if PR adds commits from people not yet listed in ./AUTHORS not to have to update ./AUTHORS or .mailmap after merging. --- .github/workflows/authors-file.yml | 39 ++++++++++++++++++++++++++++++ CONTRIBUTING.md | 6 +++++ 2 files changed, 45 insertions(+) create mode 100644 .github/workflows/authors-file.yml diff --git a/.github/workflows/authors-file.yml b/.github/workflows/authors-file.yml new file mode 100644 index 00000000000..3970aee681d --- /dev/null +++ b/.github/workflows/authors-file.yml @@ -0,0 +1,39 @@ +name: AUTHORS file + +on: + pull_request: { } + +jobs: + authors-file: + name: AUTHORS file + runs-on: ubuntu-latest + + steps: + - name: Checkout HEAD + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Check whether ./AUTHORS is up-to-date + run: | + set -exo pipefail + sort -uo AUTHORS AUTHORS + git add AUTHORS + git log --format='format:%aN <%aE>' "$( + git merge-base "origin/$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF" + )..origin/$GITHUB_HEAD_REF" >> AUTHORS + sort -uo AUTHORS AUTHORS + git diff AUTHORS >> AUTHORS.diff + + - name: Complain if ./AUTHORS isn't up-to-date + run: | + if [ -s AUTHORS.diff ]; then + cat <<'EOF' >&2 + There are the following new authors. If the commit author data is correct, + either add them to the AUTHORS file or update .mailmap. See gitmailmap(5) or: + https://git-scm.com/docs/gitmailmap + Don't hesitate to ask us for help if necessary. + EOF + cat AUTHORS.diff + exit 1 + fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ced22a354f7..cec52657957 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,6 +111,12 @@ refs #1234 You can add multiple commits during your journey to finish your patch. Don't worry, you can squash those changes into a single commit later on. +Ensure your name and email address in the commit metadata are correct. +In your first contribution (PR) also add them to [AUTHORS](./AUTHORS). +If those metadata changed since your last successful contribution, +you should update [AUTHORS](./AUTHORS) and [.mailmap](./.mailmap). +For the latter see [gitmailmap(5)](https://git-scm.com/docs/gitmailmap). + ## Pull Requests Once you've commited your changes, please update your local master From d583598d088945cd412ab74ba06e6cf2db1539aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Fri, 24 Nov 2023 12:03:35 +0100 Subject: [PATCH 6/8] GHA: drop EOL Fedora 36 --- .github/workflows/linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8f5ff033b3e..6c3c5dd6ec3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,7 +27,6 @@ jobs: - debian:10 - debian:11 # and Raspbian 11 - debian:12 # and Raspbian 12 - - fedora:36 - fedora:37 - fedora:38 - fedora:39 From 968f7401cf8a06c001d3ebe32d96f30f313f8b13 Mon Sep 17 00:00:00 2001 From: Lord Hepipud Date: Mon, 17 Apr 2023 12:56:33 +0200 Subject: [PATCH 7/8] Adds ProgressPreference SilentlyContinue We should use `$Global:ProgressPreference = 'SilentlyContinue';` to disable the progress bar during download. By doing so, information are directly written to the disk instead of written inside the memory and dumped to the disk afterwards --- doc/win-dev.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/win-dev.ps1 b/doc/win-dev.ps1 index 0789311824a..3c0427d95c2 100644 --- a/doc/win-dev.ps1 +++ b/doc/win-dev.ps1 @@ -91,6 +91,8 @@ if (-not $Env:GITHUB_ACTIONS) { ThrowOnNativeFailure } +# Disable the progress bar for downloads from the Web, which will speed up the entire download process +$Global:ProgressPreference = 'SilentlyContinue'; Install-Exe -Url "https://packages.icinga.com/windows/dependencies/boost_$($BoostVersion -join '_')-msvc-${MsvcVersion}-${Env:BITS}.exe" -Dir "C:\local\boost_$($BoostVersion -join '_')-Win${Env:BITS}" From 9944437b7b173d4e7f9fbb2b766ea4845e96dc40 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 24 Nov 2023 15:06:52 +0100 Subject: [PATCH 8/8] Update AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index c339db96d34..5af34664e91 100644 --- a/AUTHORS +++ b/AUTHORS @@ -153,6 +153,7 @@ Lennart Betz Leon Stringer lihan log1-c <24474580+log1-c@users.noreply.github.com> +Lord Hepipud Lorenz Kästle Louis Sautier Luca Lesinigo