Skip to content

Commit

Permalink
Merge pull request #9918 from Icinga/gha2141
Browse files Browse the repository at this point in the history
Update GitHub actions
  • Loading branch information
Al2Klimov authored Nov 24, 2023
2 parents 0d58029 + 9944437 commit 0ceff4c
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 6 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/authors-file.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,18 +27,18 @@ 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
- rockylinux:8 # RHEL 8
- rockylinux:9 # RHEL 9
- ubuntu:20.04
- ubuntu:22.04
- ubuntu:22.10
- ubuntu:23.04
- ubuntu:23.10

steps:
- name: Checkout HEAD
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ Lennart Betz <[email protected]>
Leon Stringer <[email protected]>
lihan <[email protected]>
log1-c <[email protected]>
Lord Hepipud <[email protected]>
Lorenz Kästle <[email protected]>
Louis Sautier <[email protected]>
Luca Lesinigo <[email protected]>
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## <a id="contributing-pull-requests"></a> Pull Requests

Once you've commited your changes, please update your local master
Expand Down
2 changes: 2 additions & 0 deletions doc/win-dev.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down

0 comments on commit 0ceff4c

Please sign in to comment.