Merge #43

43: release 2.1.7 with updated php vendor dir r=48d90782 a=48d90782



Co-authored-by: Valery Piashchynski <[email protected]>

Author: bors[bot]

.github/workflows/ci-build.yml

@@ -58,9 +58,8 @@ jobs:
       - name: Run golang tests
         run: |
           docker-compose -f ./tests/docker-compose.yml up -d
-          vendor/bin/spiral-cs check src tests
-          go mod vendor
           composer update
+          vendor_php/bin/spiral-cs check src tests
           go test -v -race -cover                    -coverprofile=jobs.txt      -covermode=atomic
           go test -v -race -cover ./broker/amqp      -coverprofile=amqp.txt      -covermode=atomic
           go test -v -race -cover ./broker/ephemeral -coverprofile=ephemeral.txt -covermode=atomic

.gitignore

@@ -2,6 +2,7 @@
 .env
 composer.lock
 vendor/
+vendor_php
 *.db
 clover.xml
 .DS_Store

Makefile

@@ -5,7 +5,6 @@ install: all
 uninstall: 
 	rm -f /usr/local/bin/rr-jobs
 test:
-	go mod vendor
 	composer update
 	go test -v -race -cover
 	go test -v -race -cover ./broker/amqp

composer.json

@@ -25,6 +25,9 @@
       "Spiral\\Jobs\\": "src/"
     }
   },
+  "config": {
+    "vendor-dir": "vendor_php"
+  },
   "autoload-dev": {
     "psr-4": {
       "Spiral\\Jobs\\Tests\\": "tests/Jobs/"

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.6
 	github.com/spf13/viper v1.6.2
-	github.com/spiral/roadrunner v1.6.3
+	github.com/spiral/roadrunner v1.8.0
 	github.com/streadway/amqp v0.0.0-20181205114330-a314942b2fd9
 	github.com/stretchr/testify v1.5.1
 	github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect

tests/bootstrap.php

@@ -13,4 +13,4 @@
 ini_set('display_errors', 'stderr');
 
 //Composer
-require dirname(__DIR__) . '/vendor/autoload.php';
+require dirname(__DIR__) . '/vendor_php/autoload.php';