From 8d28c7c453597cebe146e033e9cee62a653ac90e Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Sun, 15 Dec 2019 05:26:45 +0300 Subject: [PATCH] Upgrade patch in the build image before install dependencies --- .gitlab-ci.yml | 2 ++ composer.json | 1 + composer.lock | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35fb3f1..e7dc8aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,8 @@ Precache dependencies: - .vendorCache cache: policy: pull-push + before_script: + - sudo apk add --update --no-cache patch script: - composer install --ignore-platform-reqs diff --git a/composer.json b/composer.json index 3a3a3cf..b7e5a39 100644 --- a/composer.json +++ b/composer.json @@ -56,6 +56,7 @@ "symfony/polyfill-php73": "*" }, "extra": { + "composer-exit-on-patch-failure": true, "patches": { "codeception/base": { "Fix Codeception compatibility with PHPUnit8": "patches/codeception-phpunit-8-fix.patch" diff --git a/composer.lock b/composer.lock index 624f322..8f4c624 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0a56121050b75bd49d4d924464422c39", + "content-hash": "02ff1a9447555b3fcead7fb7cdae04e0", "packages": [ { "name": "bacon/bacon-qr-code",