Skip to content

Commit

Permalink
Merge pull request #43 from spryker-shop/release-202211.0
Browse files Browse the repository at this point in the history
Release 202211.0
  • Loading branch information
DmitryLymarenko authored Nov 25, 2022
2 parents c61b1e5 + f24dc62 commit 3212211
Show file tree
Hide file tree
Showing 177 changed files with 59,788 additions and 45,709 deletions.
1 change: 0 additions & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
IE 11
4 changes: 1 addition & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ node_modules
!/src/Orm/Propel/.gitkeep

/src/Generated
/public/Yves/assets
/public/Backoffice/assets
/public/Zed/assets
/public/*/assets/

/tests/*/*/*/_output/*
/tests/*/*/*/_support/_generated/*
2 changes: 1 addition & 1 deletion .git.docker
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7561a90d6856ee17c29ef35c4206888354d8df3b
736fb5cb4dcb7f86ac7b16bd471bdd3dd4f5fa1c
57 changes: 27 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ on:

jobs:
validation:
name: "Static analysis / PHP 7.4"
name: "Static analysis / PHP 8.0"
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
php-version: [
'7.4',
'8.0',
]

env:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: '12'
node-version: '16'

- name: NPM cache
uses: actions/cache@v2
Expand Down Expand Up @@ -115,8 +115,8 @@ jobs:

- name: Frontend install-dependencies
run: |
vendor/bin/console frontend:mp:install-dependencies
vendor/bin/console frontend:zed:install-dependencies
vendor/bin/console frontend:project:install-dependencies -vvv
- name: Install NPM packages
run: |
sudo npm install -g --unsafe-perm [email protected]
Expand All @@ -134,10 +134,7 @@ jobs:
run: node ./frontend/libs/formatter

- name: Front-end MP Unit Tests
run: yarn mp:test

- name: Front-end MP Build
run: vendor/bin/console frontend:mp:build -e production
run: npm run mp:test

- name: Validate propel files
run: |
Expand All @@ -159,12 +156,12 @@ jobs:
- name: Run Security check
run: vendor/bin/console security:check

php-74-mariadb-glue-alpine:
name: "PHP 7.4 / MariaDB / Glue / Alpine"
php-80-mariadb-glue-alpine:
name: "PHP 8.0 / MariaDB / Glue / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
TRAVIS: 1

steps:
Expand All @@ -188,12 +185,12 @@ jobs:
docker/sdk testing console queue:worker:start --stop-when-empty
docker/sdk testing codecept run -c codeception.api.yml
php-74-postgresql-acceptance-alpine:
name: "PHP 7.4 / PostgreSQL / Acceptance / Alpine"
php-80-postgresql-acceptance-alpine:
name: "PHP 8.0 / PostgreSQL / Acceptance / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
TRAVIS: 1

steps:
Expand All @@ -217,12 +214,12 @@ jobs:
docker/sdk testing codecept run -c codeception.acceptance.yml
php-74-postgresql-functional-alpine:
name: "PHP 7.4 / PostgreSQL / Functional / Alpine"
php-80-postgresql-functional-alpine:
name: "PHP 8.0 / PostgreSQL / Functional / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
TRAVIS: 1

steps:
Expand All @@ -245,12 +242,12 @@ jobs:
docker/sdk testing console queue:worker:start --stop-when-empty
docker/sdk testing codecept run -c codeception.functional.yml
php-74-mariadb-acceptance-alpine:
name: "PHP 7.4 / MariaDB / Acceptance / Alpine"
php-80-mariadb-acceptance-alpine:
name: "PHP 8.0 / MariaDB / Acceptance / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
TRAVIS: 1

steps:
Expand All @@ -274,12 +271,12 @@ jobs:
docker/sdk testing codecept run -c codeception.acceptance.yml
php-74-mariadb-functional-alpine:
name: "PHP 7.4 / MariaDB / Functional / Alpine"
php-80-mariadb-functional-alpine:
name: "PHP 8.0 / MariaDB / Functional / Alpine"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
TRAVIS: 1

steps:
Expand All @@ -302,12 +299,12 @@ jobs:
docker/sdk testing codecept run -c codeception.functional.yml
php-74-postgres-functional-debian:
name: "PHP 7.4 / PostgreSQL / Functional / Debian"
php-80-postgres-functional-debian:
name: "PHP 8.0 / PostgreSQL / Functional / Debian"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4-debian
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0-debian
TRAVIS: 1

steps:
Expand All @@ -329,12 +326,12 @@ jobs:
docker/sdk up -t -v
docker/sdk testing codecept run -c codeception.functional.yml
frontend-assets-via-docker-php-7-4:
name: "Docker / Alpine / PHP 7.4 / Frontend & Assets"
frontend-assets-via-docker-php-8-0:
name: "Docker / Alpine / PHP 8.0 / Frontend & Assets"
runs-on: ubuntu-18.04
env:
PROGRESS_TYPE: plain
SPRYKER_PLATFORM_IMAGE: spryker/php:7.4-alpine3.12
SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
steps:
- uses: actions/checkout@v2
- run: echo eyAiZXhwZXJpbWVudGFsIiA6IHRydWUsICJmZWF0dXJlcyIgOiB7ICJidWlsZGtpdCI6IHRydWUgfSB9Cg==|base64 -d|sudo tee /etc/docker/daemon.json
Expand Down
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ config/accumulated-config.json
/src/Generated/
/vendor/
FOSS.md
/public/Yves/maintenance/maintenance.marker
/public/Zed/maintenance/maintenance.marker
/public/Backoffice/maintenance/maintenance.marker
/public/*/maintenance/maintenance.marker

/data/*
!/data/import/
Expand All @@ -48,10 +46,7 @@ config/Yves/cache_bust.php
/node_modules/

# public stuff
public/Yves/assets/
public/Zed/assets/
public/Backoffice/assets/
public/MerchantPortal/assets/
/public/*/assets/

# vagrant stuff
.vagrant
Expand Down Expand Up @@ -97,6 +92,7 @@ composer.phar
c3.php
.phpstorm.meta.php
.githook_local
/architecture-baseline.json

# Yarn
.yarn/*
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Ignore paths
/.github/
/.yarn/
/docker/
/frontend/
/vendor/
/public/*/assets/**
/public/*/assets/
**/dist/**

/composer.json
Expand Down
6 changes: 5 additions & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
build:
environment:
php: '7.3'
php: '8.0.19'

tests:
override:
- true # disable test execution on scrutinizer

dependencies:
override:
- true

nodes:
analysis:
tests:
Expand Down
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ignore paths
**/node_modules/**
**/dist/**
public/*/assets/**
/public/*/assets/
77 changes: 0 additions & 77 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

38 changes: 0 additions & 38 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.js

This file was deleted.

Loading

0 comments on commit 3212211

Please sign in to comment.