Merge r1933654, r1934209, r1935338 from trunk: [CTR for CI changes]

CI: Fail early if PHP_FPM is set but not valid.
CI: Set PHP_FPM correctly for current Ubuntu images.

CI: Add *.md to the ignore list. (the "**" syntax is correct
here, per https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet)

CI: Skip Windows workflow for *.md changes.

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

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d013294e7a34a1db449c0a0d86e5a61059a7bcdb..5cff104426330c1522e154d73fdac675516386f5 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -7,6 +7,7 @@ on:
       - 'docs/**'
       - STATUS
       - CHANGES
+      - '**.md'
       - changes-entries/*
     tags:
       - 2.*
@@ -16,13 +17,14 @@ on:
       - 'docs/**'
       - STATUS
       - CHANGES
+      - '**.md'
       - changes-entries/*
 
 env:
   MARGS: "-j2"
   CFLAGS: "-g"
   # This will need updating as the ubuntu-latest image changes:
-  PHP_FPM: "/usr/sbin/php-fpm8.1"
+  PHP_FPM: "/usr/sbin/php-fpm8.3"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5cf01fafe997cb3edc19e405acbdecc3d476eb73..5f6a376bace21b485fcdd7b9fc96ff3c35b9b223 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,6 +7,7 @@ on:
       - 'docs/**'
       - STATUS
       - CHANGES
+      - '**.md'
       - changes-entries/*
     tags:
       - 2.*
@@ -16,6 +17,7 @@ on:
       - 'docs/**'
       - STATUS
       - CHANGES
+      - '**.md'
       - changes-entries/*
 
 concurrency:

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 7e0f24e793b7f2723efe4ccd6fde9446c28e1252..3317c096421e58bcb4407320268a9aa64ab1579a 100755 (executable)
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -211,3 +211,8 @@ if test -v TEST_MOD_TLS -a -v RUSTLS_VERSION; then
         popd
     fi
 fi
+
+if test -v PHP_FPM -a ! -v SKIP_TESTING; then
+    # Sanity test the php-fpm executable exists.
+    $PHP_FPM --version || exit 1
+fi

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 45e4a6b16beaa37fc6e417b209cdceee11af365d..744afab22511e15dcbd23772479bf85121b371c3 100755 (executable)
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -126,11 +126,6 @@ if test -v TEST_ASAN; then
     export ASAN_OPTIONS="log_path=$PWD/asan.log:detect_leaks=0"
 fi
 
-if test -v PHP_FPM; then
-    # Sanity test the executable exists.
-    $PHP_FPM --version
-fi
-
 # Try to keep all potential coredumps from all processes
 sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
 # Systemd based systems might process core dumps via systemd-coredump.