From: Joe Orton <jorton@apache.org>
Date: Mon, 8 Jun 2026 16:43:13 +0000 (+0000)
Subject: Merge r1935145 from trunk:
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e70b6a66b532a2be2d5555a6c2e4d49e6d98c8f7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1935145 from trunk:

CI: Configure GitHub workflows to use concurrency cancel-in-progress for
pull requests

see recommended best practices at Apache
https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=INFRA&title=GitHub+Actions+Recommended+Practices

Signed-off-by: Aurélien Pupier <apupier@ibm.com>
Submitted by: Aurélien Pupier <apupier@ibm.com>
Github: closes #667


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1935149 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e603cc8bdc..a1ca4e6e65 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -24,6 +24,10 @@ env:
   # This will need updating as the ubuntu-latest image changes:
   PHP_FPM: "/usr/sbin/php-fpm8.1"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     strategy:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ee764d3bcf..5cf01fafe9 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -18,6 +18,10 @@ on:
       - CHANGES
       - changes-entries/*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     strategy: