Overhaul (#23)

* third_party: fix git status dirty state

* Docker: use debian bookworm (12) -> trixie(13)

* CI: use debian bookworm (12) -> trixie (13)

* CI: skip 8.1 strict ci

Author: zeriyoshi

.github/workflows/ci.yaml

@@ -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
@@ -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

.github/workflows/coverage.yaml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         version: ['8.4']
         type: ['cli', 'zts']
-        distro: ['bookworm']
+        distro: ['trixie']
     outputs:
       matrix: ${{ toJson(matrix) }}
     steps:
@@ -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

.gitmodules

@@ -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

Dockerfile

@@ -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}
 
@@ -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; \
     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