diff --git a/.circleci/config.yml b/.circleci/config.yml index b839aeb..8549b28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 aliases: - - &ci-build-image quay.io/yeebase/ci-build:7.2 + - &ci-build-image quay.io/yeebase/ci-build:7.3 - &workspace_root ~/workspace - &save_composer_cache @@ -16,11 +16,11 @@ aliases: - composer-cache-v1- - &attach_workspace - at: *workspace_root + at: *workspace_root - &persist_to_workspace root: . - paths: + paths: - . jobs: @@ -32,7 +32,7 @@ jobs: steps: - checkout - restore_cache: *restore_composer_cache - + - run: | mkdir graphql shopt -s extglob dotglob @@ -61,17 +61,36 @@ jobs: FLOW_CONTEXT: Testing steps: - attach_workspace: *attach_workspace - - run: - bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml graphql/Tests/Functional + - run: bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml graphql/Tests/Functional workflows: version: 2 build_and_test: jobs: - - checkout + - checkout: + filters: + branches: + ignore: /dependabot.*/ - lint: requires: - checkout - tests: requires: - - checkout \ No newline at end of file + - checkout + + build_and_test_dependabot: + jobs: + - hold: + type: approval + filters: + branches: + only: /dependabot.*/ + - checkout: + requires: + - hold + - lint: + requires: + - checkout + - tests: + requires: + - checkout diff --git a/.dependabot/config.yml b/.dependabot/config.yml new file mode 100644 index 0000000..959789f --- /dev/null +++ b/.dependabot/config.yml @@ -0,0 +1,6 @@ +version: 1 +update_configs: + - package_manager: "php:composer" + directory: "/" + update_schedule: "weekly" + target_branch: "master" diff --git a/composer.json.ci b/composer.json.ci index 99ef382..5dbb25c 100644 --- a/composer.json.ci +++ b/composer.json.ci @@ -6,14 +6,14 @@ "bin-dir": "bin" }, "require": { - "neos/flow": "~6.0.0", - "neos/buildessentials": "~6.0.0", + "neos/flow": "~6.0", + "neos/buildessentials": "~6.0", "t3n/graphql": "@dev", "t3n/coding-standard": "~1.0.0" }, "require-dev": { - "squizlabs/php_codesniffer": "3.3.2", - "phpunit/phpunit": "~8.1", + "squizlabs/php_codesniffer": "~3.5", + "phpunit/phpunit": "~8.5", "mikey179/vfsstream": "~1.6" }, "repositories": {