Skip to content

Commit

Permalink
Merge pull request #245 from spryker-shop/release-202311.0
Browse files Browse the repository at this point in the history
Release 202311.0
  • Loading branch information
dmiseev authored Nov 22, 2023
2 parents 1aced62 + bcaaa18 commit 98c2348
Show file tree
Hide file tree
Showing 519 changed files with 27,660 additions and 13,027 deletions.
2 changes: 1 addition & 1 deletion .git.docker
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b5a63eac724e02fc4529b1b98dbf67e9d8b7c8ae
6a94e22d830f8bb01111326a825b4c12213c6415
191 changes: 90 additions & 101 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ npm-debug.log
/tests/PyzTest/*/*/_output/*
/tests/PyzTest/*/*/_support/_generated/*

/.robot/results

# propel classes
/src/Propel/Base/*
/src/Propel/Map/*
Expand All @@ -90,6 +92,7 @@ composer.phar
c3.php
.phpstorm.meta.php
.githook_local
integrator.lock

# Yarn
.yarn/*
Expand Down
27 changes: 27 additions & 0 deletions .robot/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM mcr.microsoft.com/playwright:jammy
ENV ROBOT_WORK_DIR /opt/robotframework
RUN mkdir -p ${ROBOT_WORK_DIR}

RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt install -y \
python3 \
python3-pip \
python3-tk \
make \
&& rm -rf /var/lib/apt/lists/*

RUN pip3 install \
--no-cache-dir \
robotframework \
robotframework-browser \
robotframework-databaselibrary \
robotframework-requests \
PyMySQL \
psycopg2-binary \
robotframework-jsonlibrary \
tk

RUN rfbrowser init

WORKDIR ${ROBOT_WORK_DIR}

CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
20 changes: 20 additions & 0 deletions .robot/docker-compose.robot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '3.7'

services:
robot-framework:
build:
context: ./.robot
dockerfile: Dockerfile
networks:
- private
env_file:
- ${DEPLOYMENT_PATH}/env/backoffice_eu.env # depends on application setup
labels:
'spryker.app.name': robot-framework
'spryker.app.type': robot-framework
'spryker.project': ${SPRYKER_DOCKER_PREFIX}:${SPRYKER_DOCKER_TAG}
volumes:
- ./vendor/spryker/robotframework-suite-tests:/opt/robotframework:rw
- ./.robot/results:/opt/robotframework/results:rw
networks:
private:
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
environment:
php: '8.0.19'
php: '8.1'
node: '14.0'

tests:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Spryker B2B Marketplace Demo Shop
[![Build Status](https://github.com/spryker-shop/b2b-demo-marketplace/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/spryker-shop/b2b-demo-marketplace/actions?query=branch:master)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/spryker-shop/b2b-demo-marketplace/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/spryker-shop/b2b-demo-marketplace/?branch=master)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.0-8892BF.svg)](https://php.net/)
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://php.net/)

## Description

Expand Down
3 changes: 3 additions & 0 deletions codeception.functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ extensions:
- Presentation
- Glue
- Api
# HomepageCest fails if runs after tests/PyzTest/Zed/*
# see codeception.yml
- HomepageCest
241 changes: 124 additions & 117 deletions composer.json

Large diffs are not rendered by default.

Loading

0 comments on commit 98c2348

Please sign in to comment.