Skip to content

Commit

Permalink
[CI] Use wikimedias Avro library (#22)
Browse files Browse the repository at this point in the history
  • Loading branch information
tPl0ch authored Nov 7, 2018
1 parent c91bd2a commit 90c9065
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 51 deletions.
53 changes: 11 additions & 42 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,17 @@ MAKEFLAGS =+ -rR --warn-undefined-variables

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

ifndef CONFLUENT_VERSION
CONFLUENT_VERSION := latest
endif
CONFLUENT_VERSION ?= latest
CONFLUENT_NETWORK_SUBNET ?= 172.68.0.0/24
SCHEMA_REGISTRY_IPV4 ?= 172.68.0.103
KAFKA_BROKER_IPV4 ?= 172.68.0.102
ZOOKEEPER_IPV4 ?= 172.68.0.101
COMPOSER ?= bin/composer.phar
COMPOSER_VERSION ?= 1.7.2
PHP ?= bin/php
PHP_VERSION ?= 7.2
XDEBUG_VERSION ?= 2.6.1

ifndef CONFLUENT_NETWORK_SUBNET
CONFLUENT_NETWORK_SUBNET := 172.68.0.0/24
endif

ifndef SCHEMA_REGISTRY_IPV4
SCHEMA_REGISTRY_IPV4 := 172.68.0.103
endif

ifndef KAFKA_BROKER_IPV4
KAFKA_BROKER_IPV4 := 172.68.0.102
endif

ifndef ZOOKEEPER_IPV4
ZOOKEEPER_IPV4 := 172.68.0.101
endif

ifndef COMPOSER
COMPOSER := bin/composer.phar
endif

ifndef COMPOSER_VERSION
COMPOSER_VERSION := 1.7.2
endif

ifndef PHP
PHP := bin/php
endif

ifndef PHP_VERSION
PHP_VERSION := 7.1
endif

ifndef XDEBUG_VERSION
XDEBUG_VERSION := 2.6.1
endif

-include variables.mk
export

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


platform:
docker-compose down
docker-compose up -d
sleep 25
sleep 20

clean:
rm -rf build
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"php": "~7.1",
"guzzlehttp/guzzle": "~6.3",
"beberlei/assert": "~2.7",
"flix-tech/avro-php": "^2.0"
"wikimedia/avro": "dev-master@dev"
},
"require-dev": {
"phpunit/phpunit": "~7.0",
Expand All @@ -26,6 +26,9 @@
"raphhh/trex-reflection": "Needed if you want to use the `RequestCallbackValidator`",
"doctrine/cache": "If you want to use the DoctrineCacheAdapter"
},
"replace": {
"flix-tech/avro-php": "*"
},
"autoload": {
"psr-4": {
"FlixTech\\SchemaRegistryApi\\": "src/"
Expand Down
8 changes: 0 additions & 8 deletions variables.mk.dist

This file was deleted.

0 comments on commit 90c9065

Please sign in to comment.