Verified Commit 4f6fe130 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3387706 by catch, fjgarlin: Don't make other tests depend on PHPUnit 

(cherry picked from commit 55925d1c)
parent 8243b38f

.gitlab-ci.yml

+1 −8
Original line number Diff line number Diff line
@@ -89,23 +89,16 @@ stages: 
  paths:

    - ./core/node_modules



.pull-composer-cache: &pull-composer-cache

.with-composer-cache: &with-composer-cache

  cache:

    policy: pull

    <<: *composer-cache

  dependencies:

    - '📦️ Composer'



.with-composer-cache: &with-composer-cache

  needs:

    - '📦️ Composer'

  <<: *pull-composer-cache



.with-yarn-cache: &with-yarn-cache

  dependencies:

    - '📦️ Yarn'

  needs:

    - '📦️ Yarn'

  cache:

    policy: pull

    <<: *yarn-cache

.gitlab-ci/pipeline.yml

+9 −23
Original line number Diff line number Diff line
@@ -44,23 +44,16 @@ stages: 
  paths:

    - ./core/node_modules



.pull-composer-cache: &pull-composer-cache

.with-composer-cache: &with-composer-cache

  dependencies:

    - '📦️ Composer'

  cache:

    policy: pull

    <<: *composer-cache

  dependencies:

    - '📦️ Composer'



.with-composer-cache: &with-composer-cache

  needs:

    - '📦️ Composer'

  <<: *pull-composer-cache



.with-yarn-cache: &with-yarn-cache

  dependencies:

    - '📦️ Yarn'

  needs:

    - '📦️ Yarn'

  cache:

    policy: pull

    <<: *yarn-cache
@@ -74,16 +67,9 @@ stages: 
    reports:

      junit: junit.xml



.with-unit-tests: &with-unit-tests

  needs:

    - '⚡️ PHPUnit Unit'

    - '📦️ Composer'

  <<: *pull-composer-cache



.with-composer-yarn-and-unit-tests: &with-composer-yarn-and-unit-tests

.with-composer-and-yarn: &with-composer-and-yarn

  needs:

    - '📦️ Composer'

    - '⚡️ PHPUnit Unit'

    - '📦️ Yarn'

  dependencies:

    - '📦️ Yarn'
@@ -206,7 +192,7 @@ stages: 
    CONCURRENCY: "$CONCURRENCY"



'🌐️️ PHPUnit Functional':

  <<: [ *with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  <<: [ *with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  stage: 🗜️ Test

  parallel: 6

  variables:
@@ -217,7 +203,7 @@ stages: 
    - <<: *with-database



'⚙️️ PHPUnit Kernel':

  <<: [*with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  <<: [*with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  stage: 🗜️ Test

  variables:

    <<: *test-variables
@@ -227,7 +213,7 @@ stages: 
    - <<: *with-database



'🖱️️️ PHPUnit Functional Javascript':

  <<: [ *with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  <<: [ *with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  stage: 🗜️ Test

  variables:

    <<: *test-variables
@@ -238,7 +224,7 @@ stages: 
    - <<: *with-chrome



'👷️️️ PHPUnit Build':

  <<: [ *with-unit-tests, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  <<: [ *with-composer-cache, *phpunit-artifacts, *setup-webserver, *run-tests, *default-job-settings ]

  stage: 🗜️ Test

  variables:

    <<: *test-variables
@@ -248,7 +234,7 @@ stages: 
    - <<: *with-database



'🦉️️️ Nightwatch':

  <<: [ *with-composer-yarn-and-unit-tests, *setup-webserver, *default-job-settings ]

  <<: [ *with-composer-and-yarn, *setup-webserver, *default-job-settings ]

  stage: 🗜️ Test

  variables:

    <<: *test-variables