Skip to content

Commit 90c9065

Browse files
authored
[CI] Use wikimedias Avro library (flix-tech#22)
1 parent c91bd2a commit 90c9065

File tree

3 files changed

+15
-51
lines changed

3 files changed

+15
-51
lines changed

Makefile

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,17 @@ MAKEFLAGS =+ -rR --warn-undefined-variables
33

44
.PHONY: composer-install composer-update phpstan cs-fixer examples docker run
55

6-
ifndef CONFLUENT_VERSION
7-
CONFLUENT_VERSION := latest
8-
endif
6+
CONFLUENT_VERSION ?= latest
7+
CONFLUENT_NETWORK_SUBNET ?= 172.68.0.0/24
8+
SCHEMA_REGISTRY_IPV4 ?= 172.68.0.103
9+
KAFKA_BROKER_IPV4 ?= 172.68.0.102
10+
ZOOKEEPER_IPV4 ?= 172.68.0.101
11+
COMPOSER ?= bin/composer.phar
12+
COMPOSER_VERSION ?= 1.7.2
13+
PHP ?= bin/php
14+
PHP_VERSION ?= 7.2
15+
XDEBUG_VERSION ?= 2.6.1
916

10-
ifndef CONFLUENT_NETWORK_SUBNET
11-
CONFLUENT_NETWORK_SUBNET := 172.68.0.0/24
12-
endif
13-
14-
ifndef SCHEMA_REGISTRY_IPV4
15-
SCHEMA_REGISTRY_IPV4 := 172.68.0.103
16-
endif
17-
18-
ifndef KAFKA_BROKER_IPV4
19-
KAFKA_BROKER_IPV4 := 172.68.0.102
20-
endif
21-
22-
ifndef ZOOKEEPER_IPV4
23-
ZOOKEEPER_IPV4 := 172.68.0.101
24-
endif
25-
26-
ifndef COMPOSER
27-
COMPOSER := bin/composer.phar
28-
endif
29-
30-
ifndef COMPOSER_VERSION
31-
COMPOSER_VERSION := 1.7.2
32-
endif
33-
34-
ifndef PHP
35-
PHP := bin/php
36-
endif
37-
38-
ifndef PHP_VERSION
39-
PHP_VERSION := 7.1
40-
endif
41-
42-
ifndef XDEBUG_VERSION
43-
XDEBUG_VERSION := 2.6.1
44-
endif
45-
46-
-include variables.mk
4717
export
4818

4919
docker:
@@ -99,11 +69,10 @@ install-phars:
9969
curl https://getcomposer.org/download/$(COMPOSER_VERSION)/composer.phar -o bin/composer.phar -LR -z bin/composer.phar
10070
chmod a+x bin/composer.phar
10171

102-
10372
platform:
10473
docker-compose down
10574
docker-compose up -d
106-
sleep 25
75+
sleep 20
10776

10877
clean:
10978
rm -rf build

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"php": "~7.1",
1515
"guzzlehttp/guzzle": "~6.3",
1616
"beberlei/assert": "~2.7",
17-
"flix-tech/avro-php": "^2.0"
17+
"wikimedia/avro": "dev-master@dev"
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "~7.0",
@@ -26,6 +26,9 @@
2626
"raphhh/trex-reflection": "Needed if you want to use the `RequestCallbackValidator`",
2727
"doctrine/cache": "If you want to use the DoctrineCacheAdapter"
2828
},
29+
"replace": {
30+
"flix-tech/avro-php": "*"
31+
},
2932
"autoload": {
3033
"psr-4": {
3134
"FlixTech\\SchemaRegistryApi\\": "src/"

variables.mk.dist

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

0 commit comments

Comments
 (0)