Skip to content

Commit

Permalink
Merge pull request #341 from spryker-shop/release-202404.0
Browse files Browse the repository at this point in the history
Release 202404.0
  • Loading branch information
dmiseev authored Apr 23, 2024
2 parents a0ba022 + d91cb6e commit a609bf2
Show file tree
Hide file tree
Showing 209 changed files with 39,727 additions and 45,552 deletions.
2 changes: 2 additions & 0 deletions .dockersyncignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
/docker

node_modules

!/vendor/spryker/robotframework-suite-tests/.git*
39 changes: 19 additions & 20 deletions .eslintrc.mp.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "@angular-eslint"],
"env": {
"node": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module",
"project": "./tsconfig.mp.json"
},
"extends": [
"./node_modules/@spryker/frontend-config.eslint/.eslintrc.js",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended"
],
"ignorePatterns": ["!**/*"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts"],
"parser": "@typescript-eslint/parser",
"plugins": ["deprecation"],
"extends": ["plugin:@angular-eslint/template/process-inline-templates"],
"extends": [
"./node_modules/@spryker/frontend-config.eslint/.eslintrc.js",
"plugin:@nx/typescript",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"parserOptions": {
"project": "./tsconfig.mp.json"
},
"rules": {
"deprecation/deprecation": "warn",
"no-console": ["warn", { "allow": ["warn", "error"] }],
"no-empty": "error",
"no-use-before-define": "off",
"max-classes-per-file": "off",
"max-lines": "off",
"handle-callback-err": "off",
"@typescript-eslint/array-type": "off",
"@typescript-eslint/no-restricted-imports": ["error", "rxjs/Rx"],
Expand Down Expand Up @@ -78,8 +72,13 @@
"parser": "@angular-eslint/template-parser",
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {
"@angular-eslint/template/banana-in-box": "error",
"@angular-eslint/template/no-negated-async": "error"
"@typescript-eslint/ban-types": 0,
"@typescript-eslint/no-empty-interface": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/no-unused-vars": 0,
"@angular-eslint/no-host-metadata-property": 0,
"@angular-eslint/directive-class-suffix": 0,
"no-prototype-builtins": 0
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion .git.docker
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6a94e22d830f8bb01111326a825b4c12213c6415
415d4f6d819b12d58ad48008f96f15452772bd53
94 changes: 87 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ on:
branches:
- master
workflow_dispatch:
schedule:
- cron: "0 0 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
validation:
name: "Static analysis / PHP 8.1"
name: "Static analysis"
runs-on: ubuntu-22.04
strategy:
fail-fast: false
Expand Down Expand Up @@ -529,7 +527,7 @@ jobs:
- run: docker run -t --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Zed/assets/

docker-alpine-php-8-1-mariadb-robot:
name: "Docker / Alpine / PHP 8.1 / MariaDB / Robot"
name: "Docker / Alpine / PHP 8.1 / MariaDB / Robot / API"
runs-on: ubuntu-22.04
env:
PROGRESS_TYPE: plain
Expand Down Expand Up @@ -562,7 +560,7 @@ jobs:
APPLICATION_STORE=AT docker/sdk console queue:worker:start --stop-when-empty
- name: Run Tests
run: |
docker/sdk exec robot-framework robot -v env:api_mp_b2c -v docker:True --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s tests.api.mp_b2c .
docker/sdk exec robot-framework robot -v env:api_mp_b2c -v docker:True --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s robotframework.tests.api.mp_b2c .
- name: Upload artifacts
if: always()
run: |
Expand All @@ -571,7 +569,7 @@ jobs:
--expires "$(date -d '+7 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"
docker-alpine-php-8-2-postgresql-robot:
name: "Docker / Alpine / PHP 8.2 / PostgreSQL / Robot"
name: "Docker / Alpine / PHP 8.2 / PostgreSQL / Robot / API"
runs-on: ubuntu-22.04
env:
PROGRESS_TYPE: plain
Expand Down Expand Up @@ -604,10 +602,92 @@ jobs:
APPLICATION_STORE=AT docker/sdk console queue:worker:start --stop-when-empty
- name: Run Tests
run: |
docker/sdk exec robot-framework robot -v env:api_mp_b2c -v db_engine:psycopg2 -v docker:True --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s tests.api.mp_b2c .
docker/sdk exec robot-framework robot -v env:api_mp_b2c -v db_engine:psycopg2 -v docker:True --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s robotframework.tests.api.mp_b2c .
- name: Upload artifacts
if: always()
run: |
AWS_DEFAULT_REGION=${{env.ROBOT_TESTS_ARTIFACTS_BUCKET_REGION}} AWS_ACCESS_KEY_ID=${{ secrets.ROBOT_TESTS_ARTIFACTS_KEY }} AWS_SECRET_ACCESS_KEY=${{ secrets.ROBOT_TESTS_ARTIFACTS_SECRET }} aws s3 cp .robot/results s3://${{vars.ROBOT_TESTS_ARTIFACTS_BUCKET}}/b2c-mp-robot-api-ci/${GITHUB_RUN_ID}/PHP8.2PostgreSQLRobot/ \
--recursive \
--expires "$(date -d '+7 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"
docker-alpine-php-8-2-mariadb-robot-dynamic-multistore:
name: "Docker / Alpine / PHP 8.2 / MariaDB / Robot / API / Dynamic Multistore "
runs-on: ubuntu-22.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.2
TRAVIS: 1
ROBOT_TESTS_ARTIFACTS_BUCKET_REGION: eu-west-1
steps:
- uses: actions/checkout@v3

- name: Install packages
run: |
sudo apt-get update
sudo apt-get install apache2-utils
sudo apt install awscli -q
- name: Composer install
run: composer install
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Install Project
continue-on-error: true
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.api.mariadb.dynamic-store.robot.yml
sudo bash -c "echo '127.0.0.1 backend-api.eu.spryker.local backend-api.us.spryker.local backend-gateway.eu.spryker.local backend-gateway.us.spryker.local backoffice.eu.spryker.local backoffice.us.spryker.local glue-backend.eu.spryker.local glue-backend.us.spryker.local glue-storefront.eu.spryker.local glue-storefront.us.spryker.local glue.eu.spryker.local glue.us.spryker.local mail.spryker.local mp.eu.spryker.local mp.us.spryker.local queue.spryker.local scheduler.spryker.local spryker.local swagger.spryker.local yves.eu.spryker.local yves.us.spryker.local' >> /etc/hosts"
docker/sdk up -t -v
docker/sdk cli composer dump-autoload -o -a
SPRYKER_CURRENT_REGION=EU docker/sdk console queue:worker:start --stop-when-empty
- name: Run Tests
run: |
docker/sdk exec robot-framework robot -v env:api_mp_b2c -v docker:True -v dms:true -v glue_env:http://glue.eu.spryker.local -v bapi_env:http://glue-backend.eu.spryker.local -v sapi_env:http://glue-storefront.eu.spryker.local --exclude skip-due-to-issueORskip-due-to-refactoring -d results -s robotframework.tests.api.mp_b2c .
- name: Upload artifacts
if: always()
run: |
AWS_DEFAULT_REGION=${{env.ROBOT_TESTS_ARTIFACTS_BUCKET_REGION}} AWS_ACCESS_KEY_ID=${{ secrets.ROBOT_TESTS_ARTIFACTS_KEY }} AWS_SECRET_ACCESS_KEY=${{ secrets.ROBOT_TESTS_ARTIFACTS_SECRET }} aws s3 cp .robot/results s3://${{vars.ROBOT_TESTS_ARTIFACTS_BUCKET}}/b2c-mp-robot-api-ci-dynamic-multistore/${GITHUB_RUN_ID}/PHP8.1MariaDBRobot/ \
--recursive \
--expires "$(date -d '+7 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"
docker-alpine-php-8-2-mariadb-cypress:
name: "Docker / Alpine / PHP 8.2 / MariaDB / Cypress / UI"
runs-on: ubuntu-22.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:8.2
TRAVIS: 1
ROBOT_TESTS_ARTIFACTS_BUCKET_REGION: eu-west-1
steps:
- uses: actions/checkout@v3

- name: Install packages
run: |
sudo apt-get update
sudo apt-get install apache2-utils
sudo apt install awscli -q
- name: Composer install
run: composer install
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Install Project
continue-on-error: true
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.mariadb.cypress.yml
sudo bash -c "echo '127.0.0.1 backend-api.at.spryker.local backend-api.de.spryker.local glue-backend.de.spryker.local glue-backend.at.spryker.local glue-storefront.de.spryker.local glue-storefront.at.spryker.local backend-gateway.at.spryker.local backend-gateway.de.spryker.local backoffice.at.spryker.local backoffice.de.spryker.local date-time-configurator-example.spryker.local glue.at.spryker.local glue.de.spryker.local yves.at.spryker.local yves.de.spryker.local mp.de.spryker.local mp.at.spryker.local' >> /etc/hosts"
docker/sdk up -t -v
docker/sdk cli composer dump-autoload -o -a --apcu
docker/sdk cli console queue:worker:start --stop-when-empty
- name: Run Tests
run: |
docker/sdk exec --env "ENV_REPOSITORY_ID=b2c-mp" --env "SPRYKER_MP_HOST=mp.de.spryker.local" cypress-tests npm run cy:ci:b2c-mp
- name: Upload artifacts
if: failure()
run: |
AWS_DEFAULT_REGION=${{env.ROBOT_TESTS_ARTIFACTS_BUCKET_REGION}} AWS_ACCESS_KEY_ID=${{ secrets.ROBOT_TESTS_ARTIFACTS_KEY }} AWS_SECRET_ACCESS_KEY=${{ secrets.ROBOT_TESTS_ARTIFACTS_SECRET }} aws s3 cp .cypress s3://${{vars.ROBOT_TESTS_ARTIFACTS_BUCKET}}/cypress-ui/b2c-mp/${GITHUB_RUN_ID}/ \
--recursive \
--expires "$(date -d '+7 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ npm-debug.log
/tests/PyzTest/*/*/_support/_generated/*

/.robot/results
/.cypress

# propel classes
/src/Propel/Base/*
Expand Down Expand Up @@ -105,3 +106,4 @@ docker
# angular
/.angular/cache
/.angular
.nx/cache
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
/src/Generated/
/src/Orm/Propel/Schema/
/package-lock.json
.nx/cache
9 changes: 8 additions & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
build:
image: default-jammy
environment:
php: '8.1'
node: '14.0'
node: 'v18.17'

dependencies:
before:
- 'npm cache clean --force'
- 'rm -rf node_modules'
- 'npm install'

tests:
override:
Expand Down
15 changes: 15 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
extends: ['stylelint-config-standard-scss', '@spryker/frontend-config.stylelint/.stylelintrc.json'],
rules: {
'scss/at-mixin-argumentless-call-parentheses': null,
'scss/no-global-function-names': null,
'declaration-block-no-redundant-longhand-properties': null,
'scss/at-if-no-null': null,
'scss/dollar-variable-pattern': null,
'color-hex-length': null,
'scss/dollar-variable-empty-line-before': null,
'scss/at-import-partial-extension': null,
'selector-class-pattern': null,
'scss/at-rule-conditional-no-parentheses': null,
},
};
5 changes: 4 additions & 1 deletion .stylelintrc.mp.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
module.exports = {
extends: '@spryker/frontend-config.stylelint/.stylelintrc.json',
extends: ['stylelint-config-standard-less', '@spryker/frontend-config.stylelint/.stylelintrc.json'],
rules: {
'no-empty-source': null,
'selector-max-class': 4,
'selector-max-compound-selectors': 4,
'selector-max-combinators': 4,
'selector-class-pattern': null,
'less/no-duplicate-variables': null,
'less/color-no-invalid-hex': null,
},
};
116 changes: 0 additions & 116 deletions angular.json

This file was deleted.

Loading

0 comments on commit a609bf2

Please sign in to comment.