diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b3d28dd..e31931d 100644 --- a/.github/workflows/ci-build.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index e1d0207..e98914d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .env composer.lock vendor/ +vendor_php *.db clover.xml .DS_Store diff --git a/Makefile b/Makefile index a54a252..64d4202 100644 --- a/Makefile +++ b/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 diff --git a/composer.json b/composer.json index 46829dd..c6646fc 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,9 @@ "Spiral\\Jobs\\": "src/" } }, + "config": { + "vendor-dir": "vendor_php" + }, "autoload-dev": { "psr-4": { "Spiral\\Jobs\\Tests\\": "tests/Jobs/" diff --git a/go.mod b/go.mod index 21461c5..78fcb48 100644 --- a/go.mod +++ b/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 diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 513df3f..b25fdc9 100644 --- a/tests/bootstrap.php +++ b/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';