Skip to content

Commit

Permalink
Merge branch 'nevercodealone:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rogoit authored Apr 24, 2024
2 parents d0a7a65 + ea4836c commit 9a85523
Show file tree
Hide file tree
Showing 26 changed files with 313 additions and 186 deletions.
39 changes: 33 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ stages:
- deploy_stage
- trigger_test
- deploy_live
- trigger_live_tests

trigger_test:
cypress_full_test_preview_stage:
stage: trigger_test
trigger:
project: never-code-alone/never-code-alone-cypress-basis-tests
Expand All @@ -18,6 +19,16 @@ trigger_test:
variables:
CYPRESS_BASE_URL: https://nevercodealone.projects.nevercodealone.de

playwright_screen_compare_live_against_preview:
stage: trigger_test
trigger:
project: never-code-alone/playwright-visual-regression
branch: main
strategy: depend
variables:
BASE_URL: https://nevercodealone.de
COMPARE_URL: https://nevercodealone.projects.nevercodealone.de

build:
stage: build
before_script:
Expand Down Expand Up @@ -81,11 +92,12 @@ deploy_live:
stage: deploy_live
tags:
- docker2
only:
- merge_request
- main
needs:
- trigger_test
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request" || $CI_COMMIT_BRANCH == "main"'
when: manual
allow_failure: true
- if: '$CI_PIPELINE_SOURCE == "merge_request" || $CI_COMMIT_BRANCH == "main"'
when: on_success
image: docker:latest
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY
Expand All @@ -101,3 +113,18 @@ deploy_live:
IMAGE: $CI_IMAGE
SHORTCODE1: $SHORTCODE
DATABASE_URL: mysql://$DB_USER:$DB_PWD@$DB_HOST:3306/$DB_NAME

cypress_internal_links_test_live:
stage: trigger_live_tests
trigger:
project: never-code-alone/never-code-alone-cypress-basis-tests
branch: main
strategy: depend
variables:
CYPRESS_BASE_URL: https://$URL
CYPRESS_SPEC: "cypress/e2e/internal-links.cy.ts"
needs:
- deploy_live
only:
- merge_request
- main
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"mashape/unirest-php": "^3.0",
"stof/doctrine-extensions-bundle": "^1.7",
"sulu/form-bundle": "^2.1",
"sulu/headless-bundle": "^0.10.0",
"sulu/sulu": "~2.5.0",
"symfony/config": "^5.4",
"symfony/dotenv": "^5.4",
Expand All @@ -67,13 +68,10 @@
"codeception/module-webdriver": "*",
"phpcr/phpcr-shell": "^1.3",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.9",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-symfony": "^1.2",
"rector/rector": "^0.14.8",
"rector/rector": "^0.17",
"sclable/xml-lint": "^0.5.0",
"squizlabs/php_codesniffer": "^3.6",
"sulu/sulu-rector": "^0.1.2",
"symfony/debug-bundle": "^5.4",
"symfony/error-handler": "^5.4",
"symfony/phpunit-bridge": "^5.4",
Expand Down
Loading

0 comments on commit 9a85523

Please sign in to comment.