Skip to content

Commit a6b29dd

Browse files
committed
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
1 parent 642b901 commit a6b29dd

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/linux.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- 'docs/**'
88
- STATUS
99
- CHANGES
10+
- '**.md'
1011
- changes-entries/*
1112
tags:
1213
- 2.*
@@ -16,13 +17,14 @@ on:
1617
- 'docs/**'
1718
- STATUS
1819
- CHANGES
20+
- '**.md'
1921
- changes-entries/*
2022

2123
env:
2224
MARGS: "-j2"
2325
CFLAGS: "-g"
2426
# This will need updating as the ubuntu-latest image changes:
25-
PHP_FPM: "/usr/sbin/php-fpm8.1"
27+
PHP_FPM: "/usr/sbin/php-fpm8.3"
2628

2729
concurrency:
2830
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/windows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- 'docs/**'
88
- STATUS
99
- CHANGES
10+
- '**.md'
1011
- changes-entries/*
1112
tags:
1213
- 2.*
@@ -16,6 +17,7 @@ on:
1617
- 'docs/**'
1718
- STATUS
1819
- CHANGES
20+
- '**.md'
1921
- changes-entries/*
2022

2123
concurrency:

test/travis_before_linux.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,3 +211,8 @@ if test -v TEST_MOD_TLS -a -v RUSTLS_VERSION; then
211211
popd
212212
fi
213213
fi
214+
215+
if test -v PHP_FPM -a ! -v SKIP_TESTING; then
216+
# Sanity test the php-fpm executable exists.
217+
$PHP_FPM --version || exit 1
218+
fi

test/travis_run_linux.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,6 @@ if test -v TEST_ASAN; then
126126
export ASAN_OPTIONS="log_path=$PWD/asan.log:detect_leaks=0"
127127
fi
128128

129-
if test -v PHP_FPM; then
130-
# Sanity test the executable exists.
131-
$PHP_FPM --version
132-
fi
133-
134129
# Try to keep all potential coredumps from all processes
135130
sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
136131
# Systemd based systems might process core dumps via systemd-coredump.

0 commit comments

Comments
 (0)