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/.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 be238b170c9..6c3c5dd6ec3 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: @@ -27,9 +27,9 @@ jobs: - debian:10 - debian:11 # and Raspbian 11 - debian:12 # and Raspbian 12 - - 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 @@ -37,8 +37,8 @@ jobs: - rockylinux:9 # RHEL 9 - ubuntu:20.04 - ubuntu:22.04 - - ubuntu:22.10 - ubuntu:23.04 + - ubuntu:23.10 steps: - name: Checkout HEAD 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: diff --git a/AUTHORS b/AUTHORS index c148358e434..790a847528b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -149,6 +149,7 @@ Lennart Betz Leon Stringer lihan log1-c <24474580+log1-c@users.noreply.github.com> +Lord Hepipud Lorenz Kästle Louis Sautier Luca Lesinigo 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 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}"