Skip to content

Commit

Permalink
Merge pull request #37 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 4d1c19b + 12bc2c3 commit f8610e0
Show file tree
Hide file tree
Showing 153 changed files with 72,128 additions and 62,169 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 @@ -23,9 +23,7 @@ node_modules
!/src/Orm/Propel/.gitkeep

/src/Generated
/public/Yves/assets
/public/Zed/assets
/public/Backoffice/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
126 changes: 67 additions & 59 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ on:
branches:
- master
workflow_dispatch:
schedule:
- cron: "0 0 * * *"

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

env:
Expand All @@ -39,6 +41,7 @@ jobs:
sudo sysctl -w vm.swappiness=1
sudo sysctl -w fs.file-max=262144
sudo sysctl -w vm.max_map_count=262144
- name: Runs Elasticsearch
uses: elastic/elastic-github-actions/elasticsearch@master
with:
Expand All @@ -47,7 +50,7 @@ jobs:

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

- name: NPM cache
uses: actions/cache@v2
Expand All @@ -56,18 +59,7 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Yarn get cache directory
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Yarn cache
uses: actions/cache@v2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -79,13 +71,15 @@ jobs:
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Composer cache
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Composer validate
run: composer validate

Expand All @@ -106,6 +100,7 @@ jobs:
vendor/bin/console propel:schema:copy
vendor/bin/console propel:model:build
vendor/bin/console transfer:entity:generate
- name: Setup search
run: vendor/bin/console setup:search

Expand All @@ -120,11 +115,12 @@ 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 speccy@0.11.0
- name: Speccy lint Glue specification
run: speccy lint src/Generated/Glue/Specification/spryker_rest_api.schema.yml --rules=default

Expand All @@ -138,15 +134,13 @@ 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: |
vendor/bin/console propel:schema:validate
vendor/bin/console propel:schema:validate-xml-names
- name: Validate transfer files
run: vendor/bin/console transfer:validate

Expand All @@ -161,12 +155,13 @@ 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 @@ -175,10 +170,12 @@ jobs:
- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
Expand All @@ -187,12 +184,13 @@ jobs:
docker/sdk testing codecept fixtures
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 @@ -201,23 +199,27 @@ jobs:
- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.yml
docker/sdk up -t
docker/sdk testing console queue:worker:start --stop-when-empty
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 @@ -226,23 +228,26 @@ jobs:
- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.yml
docker/sdk up -t
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 @@ -251,23 +256,27 @@ jobs:
- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot -v deploy.ci.acceptance.mariadb.yml
docker/sdk up -t
docker/sdk testing console queue:worker:start --stop-when-empty
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 @@ -276,22 +285,26 @@ jobs:
- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot deploy.ci.functional.mariadb.yml -v
docker/sdk up -t -v
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 @@ -300,39 +313,34 @@ jobs:
- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot deploy.ci.functional.yml -v
docker/sdk up -t -v
docker/sdk testing codecept run -c codeception.functional.yml
php-74-frontend-and-assets-alpine:
name: "PHP 7.4 / Frontend & Assets / Alpine"
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
TRAVIS: 1

SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
steps:
- uses: actions/checkout@v2

- name: Install apt-packages
run: |
sudo apt-get install apache2-utils
- name: Install docker-compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run docker
run: |
git clone https://github.com/spryker/docker-sdk.git ./docker
docker/sdk boot deploy.yml
SPRYKER_BUILD_HASH=myhash docker/sdk export images
docker run -i --rm -e SPRYKER_NGINX_CGI_HOST_YVES_EU=localhost -e SPRYKER_NGINX_CGI_HOST_BACKOFFICE_EU=localhost -e SPRYKER_NGINX_CGI_HOST_BACKEND_GATEWAY_EU=localhost -e SPRYKER_NGINX_CGI_HOST_BACKEND_API_EU=localhost -e SPRYKER_NGINX_CGI_HOST_GLUE_EU=localhost -e SPRYKER_NGINX_CGI_HOST_CONFIGURATOR_EU=localhost -e SPRYKER_NGINX_CGI_HOST_YVES_US=localhost -e SPRYKER_NGINX_CGI_HOST_GLUE_US=localhost -e SPRYKER_NGINX_CGI_HOST_BACKOFFICE_US=localhost -e SPRYKER_NGINX_CGI_HOST_BACKEND_GATEWAY_US=localhost -e SPRYKER_NGINX_CGI_HOST_BACKEND_API_US=localhost -e ALLOWED_IP=127.0.0.1 spryker_b2c_marketplace_frontend:1.0-frontend nginx -t
docker run -i --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Yves/assets/myhash
docker run -i --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Zed/assets/
- run: echo eyAiZXhwZXJpbWVudGFsIiA6IHRydWUsICJmZWF0dXJlcyIgOiB7ICJidWlsZGtpdCI6IHRydWUgfSB9Cg==|base64 -d|sudo tee /etc/docker/daemon.json
- run: sudo apt-get install --only-upgrade docker -y
- run: sudo curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
- run: sudo chmod +x /usr/local/bin/docker-compose
- run: git clone https://github.com/spryker/docker-sdk.git --single-branch --branch master ./docker
- run: docker/sdk boot deploy.yml
- run: SPRYKER_BUILD_HASH=myhash docker/sdk export images
- run: docker run -t --rm -e SPRYKER_NGINX_CGI_HOST_YVES_EU=localhost -e SPRYKER_NGINX_CGI_HOST_ZED_EU=localhost -e SPRYKER_NGINX_CGI_HOST_GLUE_EU=localhost -e SPRYKER_NGINX_CGI_HOST_YVES_US=localhost -e SPRYKER_NGINX_CGI_HOST_GLUE_US=localhost -e SPRYKER_NGINX_CGI_HOST_ZED_US=localhost -e ALLOWED_IP=127.0.0.1 spryker_b2c_marketplace_frontend:1.0-frontend nginx -t
- run: docker run -t --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Yves/assets/myhash
- run: docker run -t --rm --entrypoint='' spryker_b2c_marketplace_frontend:1.0-frontend ls -al /data/public/Zed/assets/
11 changes: 3 additions & 8 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 @@ -46,13 +44,9 @@ FOSS.md
/config/Yves/config_assets.php
config/Yves/cache_bust.php
/node_modules/
.yarn/

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

# vagrant stuff
.vagrant
Expand Down Expand Up @@ -99,3 +93,4 @@ composer.phar
c3.php
.phpstorm.meta.php
.githook_local
/architecture-baseline.json
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
Loading

0 comments on commit f8610e0

Please sign in to comment.