Skip to content

Commit 8322567

Browse files
authored
Merge branch 'msyk:master' into master
2 parents 311afda + f6e3d96 commit 8322567

19 files changed

Lines changed: 224 additions & 219 deletions

.github/workflows/php-7.2.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/php-7.3.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/php-7.4.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/php-8.0.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/php-8.1.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/php-8.2.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/php-8.3.dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
FROM --platform=linux/amd64 ubuntu:22.04
2+
RUN export DEBIAN_FRONTEND=noninteractive \
3+
&& apt update && apt install -y --no-install-recommends \
4+
software-properties-common \
5+
ca-certificates \
6+
wget \
7+
tar \
8+
git \
9+
pkg-config build-essential \
10+
libssl-dev \
11+
autoconf \
12+
gcc \
13+
make \
14+
curl \
15+
unzip \
16+
bison \
17+
re2c \
18+
locales \
19+
ldap-utils \
20+
openssl \
21+
slapd \
22+
language-pack-de \
23+
libgmp-dev \
24+
libicu-dev \
25+
libtidy-dev \
26+
libenchant-2-dev \
27+
libbz2-dev \
28+
libsasl2-dev \
29+
libxpm-dev \
30+
libzip-dev \
31+
libsqlite3-dev \
32+
libsqlite3-mod-spatialite \
33+
libwebp-dev \
34+
libonig-dev \
35+
libcurl4-openssl-dev \
36+
libxml2-dev \
37+
libxslt1-dev \
38+
libpq-dev \
39+
libreadline-dev \
40+
libldap2-dev \
41+
libsodium-dev \
42+
libargon2-0-dev \
43+
libmm-dev \
44+
libsnmp-dev \
45+
postgresql \
46+
postgresql-contrib \
47+
snmpd \
48+
snmp-mibs-downloader \
49+
freetds-dev \
50+
unixodbc-dev \
51+
llvm \
52+
clang \
53+
dovecot-core \
54+
dovecot-pop3d \
55+
dovecot-imapd \
56+
sendmail \
57+
firebird-dev \
58+
liblmdb-dev \
59+
libtokyocabinet-dev \
60+
libdb-dev \
61+
libqdbm-dev \
62+
libjpeg-dev \
63+
libpng-dev \
64+
libfreetype6-dev \
65+
&& apt -y clean \
66+
&& rm -rf /var/lib/apt/lists/*
67+
RUN git clone --depth 1 --branch master https://github.com/php/php-src.git
68+
RUN cd php-src; export CC=clang; export CXX=clang++; export CFLAGS="-DZEND_TRACK_ARENA_ALLOC"; ./buildconf --force; ./configure --enable-debug --enable-mbstring --with-openssl --with-curl; make -j$(/usr/bin/nproc); make TEST_PHP_ARGS=-j$(/usr/bin/nproc) test; make install
69+
COPY composer.json /composer.json
70+
COPY composer.lock /composer.lock
71+
COPY src /src
72+
COPY test /test
73+
RUN curl -sS https://getcomposer.org/installer | php; mv composer.phar /usr/local/bin/composer; chmod +x /usr/local/bin/composer
74+
RUN cd / && composer update
75+
#RUN composer test
76+
CMD [ "/sbin/init" ]

.github/workflows/php-src.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
php: [ '8.1', '8.2', '8.3' ]
15+
php: [ '8.1', '8.2', '8.3', '8.4' ]
1616
steps:
17-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
17+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
1818
- name: Run docker compose
1919
shell: bash
2020
run: |

.github/workflows/php.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,40 @@ name: Test
22

33
on:
44
push:
5+
branches:
6+
- "*"
57
pull_request:
8+
branches: [ 'master', 'main' ]
69
workflow_dispatch:
710
schedule:
811
- cron: '0 9 15 * *'
912

1013
jobs:
1114
test:
1215
name: Test
13-
runs-on: ubuntu-latest
16+
runs-on: ${{ matrix.os }}
17+
env:
18+
PHP_EXTENSIONS: mbstring, json, bcmath, zip, pdo, pdo_mysql, pdo_pgsql, pdo_sqlite, exif, gd, ldap, fileinfo
1419
strategy:
1520
matrix:
16-
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
21+
# https://github.com/shivammathur/setup-php?tab=readme-ov-file#cloud-osplatform-support
22+
os: [ 'ubuntu-22.04', 'windows-2022', 'macos-14' ]
23+
php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
1724
steps:
18-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
19-
- name: Run docker-compose
20-
shell: bash
21-
run: |
22-
cp .github/workflows/php-${{ matrix.php }}.dockerfile Dockerfile
23-
docker-compose up -d
24-
sleep 30
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
28+
- name: Install PHP with extensions
29+
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
30+
with:
31+
php-version: ${{ matrix.php-version }}
32+
coverage: pcov
33+
extensions: ${{ env.PHP_EXTENSIONS }}
34+
35+
- name: Prepare environment
36+
run: composer update
2537

2638
- name: Run testing
27-
shell: bash
2839
run: |
29-
sleep 30
30-
docker-compose exec -T web sh -c "cd / && composer test"
40+
php -v
41+
composer test

0 commit comments

Comments
 (0)