Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
zeriyoshi committed Aug 21, 2024
1 parent b1fb026 commit 77a4f13
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/octocov.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
coverage:
acceptable: 60%
paths:
- ext/coverage.xml
- ../ext/lcov.info
comment:
if: is_pull_request
diff:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
docker compose build --pull --no-cache --build-arg PLATFORM="linux/amd64" --build-arg IMAGE="php" --build-arg TAG="${{ matrix.version }}-${{ matrix.type }}-${{ matrix.distro }}"
- name: Test with gcov
run: |
docker compose run -v "$(pwd)/ext:/ext" --rm shell /bin/sh -c "pskel test gcov && gcovr /ext --exclude Zend/* --exclude third_party/* --xml /ext/coverage.xml"
docker compose run -v "$(pwd)/ext:/ext" --rm shell /bin/sh -c 'pskel test gcov && lcov --capture --directory "/ext" --output-file "/ext/lcov.info" --exclude "Zend/*" --exclude "third_party/*"'
- name: Coverage report
uses: k1LoW/octocov-action@v1
with:
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
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.3-zts-alpine
ARG TAG=8.3-zts-bookworm

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

Expand All @@ -19,17 +19,15 @@ RUN docker-php-source extract \
&& 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-20" \
"python3-pip" \
"lcov" "gzip" \
&& update-alternatives --install "/usr/bin/clang" clang "/usr/bin/clang-20" 100 \
&& update-alternatives --install "/usr/bin/clang++" clang++ "/usr/bin/clang++-20" 100; \
else \
apk add --no-cache "bison" "zlib-dev" "sqlite-dev" "libxml2-dev" \
"autoconf" "pkgconfig" "make" "gcc" "g++" "valgrind" "valgrind-dev" \
"musl-dev" "rsync" "git" "openssh" \
"patch" \
"py3-pip"; \
fi \
&& pip install --break-system-packages "gcovr"
"patch" "lcov" "gzip"; \
fi

COPY ./patches /patches
COPY ./ext /ext

0 comments on commit 77a4f13

Please sign in to comment.