Skip to content

Overhaul #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 2, 2025
Merged

Overhaul #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25cae8b
third_party: fix git status dirty state
zeriyoshi Sep 2, 2025
faecc87
Docker: use debian bookworm (12) -> trixie(13)
zeriyoshi Sep 2, 2025
f71c632
CI: use debian bookworm (12) -> trixie (13)
zeriyoshi Sep 2, 2025
fdd2c41
CI: skip 8.1 strict ci
zeriyoshi Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
platform: ['linux/amd64', 'linux/arm64/v8', 'linux/s390x']
version: ['8.1', '8.2', '8.3', '8.4']
type: ['cli', 'zts']
distro: ['bookworm', 'alpine']
distro: ['trixie', 'alpine']
steps:
- name: Checkout
uses: actions/checkout@v5
Expand All @@ -45,14 +45,14 @@ jobs:
run: |
docker compose run --rm shell pskel test valgrind
- name: Test extension with LLVM Sanitizer (MemorySanitizer)
if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine'
if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine' && matrix.version != '8.1'
run: |
docker compose run --rm shell pskel test msan
- name: Test extension with LLVM Sanitizer (AddressSanitizer)
if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine'
if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine' && matrix.version != '8.1'
run: |
docker compose run --rm shell pskel test asan
- name: Test extension with LLVM Sanitizer (UndefinedBehaviorSanitizer)
if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine'
if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine' && matrix.version != '8.1'
run: |
docker compose run --rm shell pskel test ubsan
3 changes: 2 additions & 1 deletion .github/workflows/coverage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
version: ['8.4']
type: ['cli', 'zts']
distro: ['bookworm']
distro: ['trixie']
outputs:
matrix: ${{ toJson(matrix) }}
steps:
Expand Down Expand Up @@ -52,6 +52,7 @@ jobs:
sudo apt-get install -y "lcov"
LCOV_FILES="$(find . -name "lcov.info")"
CMD="$(which "lcov")"
CMD+=" --ignore-errors format"
for LCOV_FILE in ${LCOV_FILES}; do
CMD+=" -a ${LCOV_FILE}"
done
Expand Down
4 changes: 1 addition & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
[submodule "ext/third_party/timelib"]
path = ext/third_party/timelib
url = https://github.com/derickr/timelib.git
[submodule "derickr/timelib"]
path = ext/third_party/timelib
url = https://github.com/derickr/timelib.git
ignore = dirty
13 changes: 6 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PLATFORM=${BUILDPLATFORM:-linux/amd64}
ARG IMAGE=php
ARG TAG=8.4-cli-bookworm
ARG TAG=8.4-cli-trixie

FROM --platform=${PLATFORM} ${IMAGE}:${TAG}

Expand All @@ -11,21 +11,20 @@ ENV LC_ALL="C"

RUN docker-php-source extract \
&& if test -f "/etc/debian_version"; then \
echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm main" > "/etc/apt/sources.list.d/llvm.list" \
&& echo "deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm main" >> "/etc/apt/sources.list.d/llvm.list" \
&& curl -fsSL "https://apt.llvm.org/llvm-snapshot.gpg.key" -o "/etc/apt/trusted.gpg.d/apt.llvm.org.asc" \
&& apt-get update \
apt-get update \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -y "bison" "re2c" "zlib1g-dev" "libsqlite3-dev" "libxml2-dev" \
"autoconf" "pkg-config" "make" "gcc" "valgrind" "rsync" "git" "ssh" \
"clang-19" \
"clang" \
"lcov" "gzip" \
"vim" \
&& update-alternatives --install "/usr/bin/clang" clang "/usr/bin/clang-19" 100 \
&& update-alternatives --install "/usr/bin/clang++" clang++ "/usr/bin/clang++-19" 100; \
Comment on lines 20 to 21
Copy link

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The update-alternatives commands are still referencing clang-19 and clang++-19, but the installation was changed to use the generic 'clang' package. These should be updated to reference the actual clang binaries installed by the Debian package (likely /usr/bin/clang and /usr/bin/clang++).

Suggested change
&& update-alternatives --install "/usr/bin/clang" clang "/usr/bin/clang-19" 100 \
&& update-alternatives --install "/usr/bin/clang++" clang++ "/usr/bin/clang++-19" 100; \
&& update-alternatives --install "/usr/bin/clang" clang "/usr/bin/clang" 100 \
&& update-alternatives --install "/usr/bin/clang++" clang++ "/usr/bin/clang++" 100; \

Copilot uses AI. Check for mistakes.
else \
apk add --no-cache "bison" "zlib-dev" "sqlite-dev" "libxml2-dev" "linux-headers" \
"autoconf" "pkgconfig" "make" "gcc" "g++" "valgrind" "valgrind-dev" \
"musl-dev" "rsync" "git" "openssh" \
"patch" "lcov" "gzip"; \
"patch" "lcov" "gzip" \
"vim"; \
fi

COPY ./pskel.sh /usr/local/bin/pskel
Expand Down