Skip to content

Commit a3a856e

Browse files
nick-zhnick-zh
committed
Merge branch 'main' into topar-add-metadata-prop
2 parents 78a9535 + 65e3862 commit a3a856e

13 files changed

+121
-275
lines changed

‎.appveyor.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,35 @@ environment:
88
BIN_SDK_VER: 2.2.0
99
DEP: librdkafka-1.5.3
1010
matrix:
11-
- PHP_VER: 7.3
11+
- PHP_VER: 7.4
1212
TS: 0
1313
VC: vc15
1414
ARCH: x64
1515
OPCACHE: 0
16-
- PHP_VER: 7.3
16+
- PHP_VER: 7.4
1717
TS: 1
1818
VC: vc15
1919
ARCH: x64
2020
OPCACHE: 1
21-
- PHP_VER: 7.4
21+
- PHP_VER: 8.0
2222
TS: 0
23-
VC: vc15
23+
VC: vs16
2424
ARCH: x64
2525
OPCACHE: 0
26-
- PHP_VER: 7.4
26+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
27+
- PHP_VER: 8.0
2728
TS: 1
28-
VC: vc15
29+
VC: vs16
2930
ARCH: x64
3031
OPCACHE: 1
31-
- PHP_VER: 8.0
32+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
33+
- PHP_VER: 8.1
3234
TS: 0
3335
VC: vs16
3436
ARCH: x64
3537
OPCACHE: 0
3638
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
37-
- PHP_VER: 8.0
39+
- PHP_VER: 8.1
3840
TS: 1
3941
VC: vs16
4042
ARCH: x64

‎.github/workflows/test.yml

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,34 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- php: '8.0.0'
16-
librdkafka: 'v1.7.0'
15+
- php: '8.1.0'
16+
librdkafka: 'v1.8.2'
1717
memcheck: '1'
18-
- php: '8.0.0'
18+
- php: '8.1.0'
19+
librdkafka: 'v1.8.2'
20+
- php: '8.0.13'
21+
librdkafka: 'v1.8.2'
22+
- php: '7.4.26'
23+
librdkafka: 'v1.8.2'
24+
- php: '8.1.0'
1925
librdkafka: 'v1.7.0'
20-
- php: '7.4.0'
26+
- php: '8.0.13'
2127
librdkafka: 'v1.7.0'
22-
- php: '7.3.0'
28+
- php: '7.4.26'
2329
librdkafka: 'v1.7.0'
24-
- php: '8.0.0'
25-
librdkafka: 'v1.6.1'
26-
- php: '7.4.0'
27-
librdkafka: 'v1.6.1'
28-
- php: '7.3.0'
29-
librdkafka: 'v1.6.1'
30-
- php: '8.0.0'
31-
librdkafka: 'v1.5.3'
32-
- php: '7.4.0'
33-
librdkafka: 'v1.5.3'
34-
- php: '7.3.0'
35-
librdkafka: 'v1.5.3'
36-
- php: '8.0.0'
37-
librdkafka: 'v1.4.4'
38-
- php: '7.4.0'
39-
librdkafka: 'v1.4.4'
40-
- php: '7.3.0'
41-
librdkafka: 'v1.4.4'
42-
- php: '8.0.0'
30+
- php: '8.1.0'
31+
librdkafka: 'v1.6.2'
32+
- php: '8.0.13'
33+
librdkafka: 'v1.6.2'
34+
- php: '7.4.26'
35+
librdkafka: 'v1.6.2'
36+
- php: '8.1.0'
4337
librdkafka: 'master'
4438
experimental: true
45-
- php: '7.4.0'
39+
- php: '8.0.13'
4640
librdkafka: 'master'
4741
experimental: true
48-
- php: '7.3.0'
42+
- php: '7.4.26'
4943
librdkafka: 'master'
5044
experimental: true
5145

‎.github/workflows/test/build-librdkafka.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
set -ex
44

5-
if ! [ -f ~/build-cache/librdkafka/usr/local/include/librdkafka/rdkafka.h ] || ! [ -f ~/build-cache/librdkafka/usr/local/bin/kafkacat ]; then
5+
if ! [ -f ~/build-cache/librdkafka/usr/local/include/librdkafka/rdkafka.h ] || ! [ -f ~/build-cache/librdkafka/usr/local/bin/kcat ]; then
66
echo "librdkafka build is not cached"
77

8-
git clone --depth 1 --branch "${LIBRDKAFKA_VERSION:-1.5.0}" "${LIBRDKAFKA_REPOSITORY_URL:-https://github.com/edenhill/librdkafka.git}"
8+
git clone --depth 1 --branch "${LIBRDKAFKA_VERSION:-1.6.0}" "${LIBRDKAFKA_REPOSITORY_URL:-https://github.com/edenhill/librdkafka.git}"
99

1010
cd librdkafka
1111
./configure
@@ -18,9 +18,9 @@ if ! [ -f ~/build-cache/librdkafka/usr/local/include/librdkafka/rdkafka.h ] || !
1818
sudo ldconfig
1919
cd ..
2020

21-
git clone --depth 1 --branch "1.6.0" "${LIBRDKAFKA_REPOSITORY_URL:-https://github.com/edenhill/kafkacat.git}"
21+
git clone --depth 1 --branch "1.7.0" "${LIBRDKAFKA_REPOSITORY_URL:-https://github.com/edenhill/kcat.git}"
2222

23-
cd kafkacat
23+
cd kcat
2424
./configure
2525
make
2626
sudo make install DESTDIR=$HOME/build-cache/librdkafka

‎.github/workflows/test/start-kafka.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ printf "\n127.0.0.1 kafka\n"|sudo tee /etc/hosts >/dev/null
1010
echo "Waiting for Kafka to be ready"
1111

1212
for i in $(seq 1 20); do
13-
if kafkacat -b 127.0.0.1 -L; then
13+
if kcat -b 127.0.0.1 -L; then
1414
echo "Kafka is ready"
1515
exit 0
1616
fi

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.lo
33
*.swp
44
.deps
5+
*.dep
56
.libs
67
Makefile
78
Makefile.fragments
@@ -14,16 +15,19 @@ build
1415
config.guess
1516
config.h
1617
config.h.in
18+
config.h.in~
1719
config.log
1820
config.nice
1921
config.status
2022
config.sub
2123
configure
2224
configure.in
25+
configure.ac
2326
include
2427
install-sh
2528
libtool
2629
ltmain.sh
30+
ltmain.sh.backup
2731
missing
2832
mkinstalldirs
2933
modules

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# PHP Kafka extension (php-simple-kafka-client)
22

3-
[![Supported librdkafka versions: >= 1.4.0](https://img.shields.io/badge/librdkafka-%3E%3D%201.4.0-blue.svg)](https://github.com/edenhill/librdkafka/releases)
3+
[![Supported librdkafka versions: >= 1.6.0](https://img.shields.io/badge/librdkafka-%3E%3D%201.6.0-blue.svg)](https://github.com/edenhill/librdkafka/releases)
44
[![Supported Kafka versions: >= 0.9](https://img.shields.io/badge/kafka-%3E%3D%200.9-blue.svg)](https://github.com/edenhill/librdkafka/blob/master/INTRODUCTION.md#broker-version-compatibility)
55
![Supported Redpanda versions: >= 20.x](https://img.shields.io/badge/redpanda-%3E%3D20.x-red)
6-
![Supported PHP versions: 7.x .. 8.x](https://img.shields.io/badge/php-7.x%20..%208.x-blue.svg)
6+
![Supported PHP versions: 7.4 .. 8.x](https://img.shields.io/badge/php-7.4%20..%208.x-blue.svg)
77
[![License: BSD-3](https://img.shields.io/badge/License-BSD--3-green.svg)](https://github.com/php-kafka/php-simple-kafka-client/blob/main/LICENSE)
88
[![Join the chat at https://gitter.im/php-kafka/php-simple-kafka-client](https://badges.gitter.im/php-kafka/php-simple-kafka-client.svg)](https://gitter.im/php-kafka/php-simple-kafka-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
99

‎config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ if test "$PHP_SIMPLE_KAFKA_CLIENT" != "no"; then
5555
yes
5656
#endif
5757
],[
58-
AC_MSG_RESULT([>= 1.4.0])
58+
AC_MSG_RESULT([>= 1.6.0])
5959
],[
60-
AC_MSG_ERROR([librdkafka version 1.4.0 or greater required.])
60+
AC_MSG_ERROR([librdkafka version 1.6.0 or greater required.])
6161
])
6262

6363
LDFLAGS="$ORIG_LDFLAGS"

0 commit comments

Comments
 (0)