Skip to content

Commit a42871e

Browse files
author
Fifciuu
committed
Merge branch 'release/v1.12.3' into hotfix/v1.12.3
2 parents b83b94d + 2e78f37 commit a42871e

35 files changed

+2991
-129
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,27 @@
33

44
closes #
55

6-
### Short Description and Why It's Useful
6+
### Short Description of the PR
77
<!-- describe in a few words what is this Pull Request changing and why it's useful -->
88

99

10-
1110
### Screenshots of Visual Changes before/after (if There Are Any)
1211
<!-- if you made any changes in the UI layer please provide before/after screenshots -->
1312

14-
### Which Environment This Relates To
15-
Check your case. In case of any doubts please read about [Release Cycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html)
13+
### Pull Request Checklist
14+
<!-- we will not merge your Pull Request until all checkboxes are checked -->
15+
- [ ] I have updated the Changelog ([V1](https://github.com/DivanteLtd/vue-storefront/blob/develop/CHANGELOG.md)) [v2](https://docs-next.vuestorefront.io/contributing/creating-changelog.html) and mentioned all breaking changes in the public API.
16+
- [ ] I have documented all new public APIs and made changes to existing docs mentioning the parts I've changed so they're up to date.
17+
- [ ] I have tested my Pull Request on production build and (to my knowledge) it works without any issues
18+
<!-- VSF Next only -->
19+
- [ ] I have followed [naming conventions](https://github.com/kettanaito/naming-cheatsheet)
1620

17-
- [ ] Test version (https://test.storefrontcloud.io) - this is a new feature or improvement for Vue Storefront. I've created branch from `develop` branch and want to merge it back to `develop`
18-
- [ ] RC version (https://next.storefrontcloud.io) - this is a stabilisation fix for Release Candidate of Vue Storefront. I've created branch from `release` branch and want to merge it back to `release`
19-
- [ ] Stable version (https://demo.storefrontcloud.io) - this is an important fix for current stable version. I've created branch from `hotfix` or `master` branch and want to merge it back to `hotfix`
21+
<!-- Please get familiar with following contribution tules https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md -->
2022

2123
### Upgrade Notes and Changelog
2224
- [x] No upgrade steps required (100% backward compatibility and no breaking changes)
2325
- [ ] I've updated the [Upgrade notes](https://github.com/vuestorefront/vue-storefront/blob/develop/docs/guide/upgrade-notes/README.md) and [Changelog](https://github.com/vuestorefront/vue-storefront/blob/develop/CHANGELOG.md) on how to port existing Vue Storefront sites with this new feature
2426

25-
**IMPORTANT NOTICE** - Remember to update `CHANGELOG.md` with description of your change
2627

2728
### Contribution and Currently Important Rules Acceptance
2829
<!-- Please get familiar with following info -->

‎.github/workflows/deploy-storefrontcloud.yml‎

Lines changed: 12 additions & 7 deletions
Large diffs are not rendered by default.

‎.github/workflows/docs-v1-deployment.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Deploy Docs
2+
on:
3+
push:
4+
branches:
5+
- master
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout code
12+
uses: actions/checkout@v1
13+
- name: Build and publish docker image
14+
uses: elgohr/Publish-Docker-Github-Action@master
15+
with:
16+
name: docs-storefrontcloud-io/v1:${{ github.sha }}
17+
registry: registry.storefrontcloud.io
18+
username: ${{ secrets.DOCS_CLOUD_USERNAME }}
19+
password: ${{ secrets.DOCS_CLOUD_PASSWORD }}
20+
workdir: docs
21+
dockerfile: Dockerfile
22+
buildoptions: "--compress"
23+
deploy:
24+
runs-on: ubuntu-latest
25+
needs: build
26+
steps:
27+
- uses: chrnorm/deployment-action@releases/v1
28+
name: Create GitHub deployment
29+
id: deployment
30+
with:
31+
token: "${{ github.token }}"
32+
target_url: https://docs.europe-west1.gcp.storefrontcloud.io/v1
33+
environment: production
34+
initial_status: in_progress
35+
- name: Deploy on docs.europe-west1.gcp.storefrontcloud.io/v1
36+
run: |
37+
if curl -s -H 'X-User-Id: ${{ secrets.DOCS_CLOUD_USERNAME }}' -H 'X-Api-Key: ${{ secrets.DOCS_CLOUD_PASSWORD }}' -H 'Content-Type: application/json' -X POST -d '{"code":"docs","region":"europe-west1.gcp","additionalApps":{"apps":[{"name":"docs-v1","tag":"${{ github.sha }}","image":"registry.storefrontcloud.io/docs-storefrontcloud-io/v1","path":"/v1","port":"80"}]}}' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
38+
echo "Instance updated"
39+
else
40+
echo "Something went wrong during the update process..."
41+
exit 1
42+
fi
43+
- name: Update deployment status (success)
44+
if: success()
45+
uses: chrnorm/deployment-status@releases/v1
46+
with:
47+
token: "${{ github.token }}"
48+
target_url: https://docs.europe-west1.gcp.storefrontcloud.io/v1
49+
state: "success"
50+
description: Congratulations! The deploy is done.
51+
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
52+
- name: Update deployment status (failure)
53+
if: failure()
54+
uses: chrnorm/deployment-status@releases/v1
55+
with:
56+
token: "${{ github.token }}"
57+
target_url: https://docs.europe-west1.gcp.storefrontcloud.io/v1
58+
description: Unfortunately, the instance hasn't been updated.
59+
state: "failure"
60+
deployment_id: ${{ steps.deployment.outputs.deployment_id }}

‎.github/workflows/run-e2e-regression.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Run E2E Regression Tests
2+
on:
3+
schedule:
4+
- cron: "0 0 * * 1-5"
5+
jobs:
6+
run_e2e_tests:
7+
name: Run E2E Tests
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
package: ["ct", "bp"]
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v2
15+
with:
16+
ref: next
17+
18+
- name: Setup node
19+
uses: actions/setup-node@v2
20+
with:
21+
node-version: '12'
22+
23+
- name: Get cached dependencies
24+
uses: actions/cache@v2
25+
with:
26+
path: |
27+
~/.cache/Cypress
28+
**/node_modules
29+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
30+
31+
- name: Install dependencies
32+
run: yarn install
33+
34+
- name: Build tools
35+
run: yarn build:${{ matrix.package }}
36+
37+
- name: Run cypress tests
38+
uses: cypress-io/github-action@v2.8.2
39+
with:
40+
start: yarn dev:${{ matrix.package }}
41+
wait-on: 'http://localhost:3000'
42+
command: yarn run test:e2e:${{ matrix.package }}:hl
43+
browser: chrome
44+
headless: true
45+
install: false
46+
env:
47+
CYPRESS_INCLUDE_TAGS: regression
48+
49+
- name: Generate report
50+
if: ${{ always() }}
51+
run: yarn test:e2e:${{ matrix.package }}:generate:report
52+
53+
- name: Upload report artifact
54+
uses: actions/upload-artifact@v2
55+
if: ${{ always() }}
56+
with:
57+
name: report
58+
path: "packages/$${{ matrix.package }}/theme/tests/e2e/report"
59+
env:
60+
bp: boilerplate
61+
ct: commercetools

‎.github/workflows/run-e2e-tests.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Run E2E Tests
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tags_include:
6+
description: "Include tags"
7+
required: false
8+
tags_exclude:
9+
description: "Exclude tags"
10+
required: false
11+
package:
12+
description: "Package"
13+
default: "ct"
14+
required: true
15+
browser:
16+
description: "Browser"
17+
default: "chrome"
18+
required: true
19+
jobs:
20+
run_e2e_tests:
21+
name: Run E2E Tests
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout code
25+
uses: actions/checkout@v2
26+
27+
- name: Setup node
28+
uses: actions/setup-node@v2
29+
with:
30+
node-version: '12'
31+
32+
- name: Get cached dependencies
33+
uses: actions/cache@v2
34+
with:
35+
path: |
36+
~/.cache/Cypress
37+
**/node_modules
38+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
39+
40+
- name: Install dependencies
41+
run: yarn install
42+
43+
- name: Build tools
44+
run: yarn build:${{ github.event.inputs.package }}
45+
46+
- name: Run cypress tests
47+
uses: cypress-io/github-action@v2.8.2
48+
with:
49+
start: yarn dev:${{ github.event.inputs.package }}
50+
wait-on: 'http://localhost:3000'
51+
command: yarn run test:e2e:${{ github.event.inputs.package }}:hl
52+
browser: ${{ github.event.inputs.browser }}
53+
headless: true
54+
install: false
55+
env:
56+
CYPRESS_INCLUDE_TAGS: ${{ github.event.inputs.tags_include }}
57+
CYPRESS_EXCLUDE_TAGS: ${{ github.event.inputs.tags_exclude }}
58+
59+
- name: Generate report
60+
if: ${{ always() }}
61+
run: yarn test:e2e:${{ github.event.inputs.tags_exclude }}:generate:report
62+
63+
- name: Upload report artifact
64+
uses: actions/upload-artifact@v2
65+
if: ${{ always() }}
66+
with:
67+
name: report
68+
path: "packages/$${{ github.event.inputs.package }}/theme/tests/e2e/report"
69+
env:
70+
bp: boilerplate
71+
ct: commercetools

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.13.0] - UNRELEASED
9+
10+
### Added
11+
- Added information about i18n & Unit tests in modules to docs - @lukaszjedrasik (#4991)
12+
- Updated VSF1 insfrastructure's schema - @lukaszjedrasik ([#5531](https://github.com/vuestorefront/vue-storefront/issues/5531))
13+
14+
### Fixed
15+
- Fixed some typo in docs (#5071)
816

917
## [1.12.3] - 2020.??.??
1018

‎docs/.vuepress/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
base: '/',
2+
base: '/v1/',
33
port: 8081,
44
markdown: {
55
toc: {

‎docs/.vuepress/public/GitHub-Architecture-VS.png‎

-11.5 KB
Loading

‎docs/Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM node:12 AS build
2+
3+
WORKDIR /var/www
4+
5+
COPY . .
6+
7+
RUN npm install \
8+
&& npm run docs:build
9+
10+
FROM nginx
11+
12+
COPY --from=build /var/www/.vuepress/dist /usr/share/nginx/html/v1

‎docs/build-docker.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
TAG=`git rev-parse HEAD`
2+
docker build -t registry.storefrontcloud.io/docs-storefrontcloud-io/v1:${TAG:0:8} -f Dockerfile .
3+
docker push registry.storefrontcloud.io/docs-storefrontcloud-io/v1:${TAG:0:8}

0 commit comments

Comments
 (0)