Skip to content

Commit

Permalink
Merge release/1.0.0-rc.1 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jul 27, 2021
2 parents b7056ba + 24803de commit 1c4323e
Show file tree
Hide file tree
Showing 157 changed files with 20,199 additions and 8,993 deletions.
11 changes: 6 additions & 5 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"login": "bloodf",
"name": "Heitor Ramon Ribeiro",
"avatar_url": "https://avatars.githubusercontent.com/u/1626923?v=4",
"profile": "http://heitorramon.com/",
"profile": "https://github.com/bloodf",
"contributions": [
"code",
"maintenance",
Expand All @@ -25,7 +25,7 @@
"login": "domideimel",
"name": "Dominik Deimel",
"avatar_url": "https://avatars.githubusercontent.com/u/32941053?v=4",
"profile": "https://dominikdeimel.com/",
"profile": "https://github.com/domideimel",
"contributions": [
"code",
"doc"
Expand All @@ -35,7 +35,7 @@
"login": "LiorLindvor",
"name": "Lior Lindvor",
"avatar_url": "https://avatars.githubusercontent.com/u/6757942?v=4",
"profile": "http://cyberfuze.com/",
"profile": "https://github.com/LiorLindvor",
"contributions": [
"code"
]
Expand All @@ -55,14 +55,15 @@
"avatar_url": "https://avatars.githubusercontent.com/u/20449158?v=4",
"profile": "https://github.com/hcmlopes",
"contributions": [
"code",
"doc"
]
},
{
"login": "filrak",
"name": "Filip Rakowski",
"avatar_url": "https://avatars.githubusercontent.com/u/15185752?v=4",
"profile": "https://rakowski.dev/",
"profile": "https://github.com/filrak",
"contributions": [
"question",
"mentoring",
Expand Down Expand Up @@ -102,5 +103,5 @@
]
}
],
"contributorsPerLine": 7
"contributorsPerLine": 6
}
42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

100 changes: 100 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
name: "🐛 Bug report"
description: Report errors or unexpected behavior
labels:
- bug
- triage-needed
title: '[Bug]: '
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report, please make sure to [search for existing issues](https://github.com/vuestorefront/magento2/issues) before filing a new one!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. [email protected]
validations:
required: false
- type: textarea
id: what-to-expect
attributes:
label: Expected Behavior
placeholder: What were you expecting?
value: ""
validations:
required: false
- type: textarea
id: what-happened
attributes:
label: Actual Behavior
placeholder: What happened instead??
value: ""
validations:
required: true
- type: textarea
id: solution
attributes:
label: Possible Solution
description: Also, if possible provide the information on how to implement the solution.
placeholder: Do you have any possible solution or fix for this bug?
value: ""
validations:
required: false
- type: textarea
id: reproduce
attributes:
label: Steps to reproduce
description: Please provide detailed instructions on how to reproduce.
placeholder: How we can reproduce this bug?
value: ""
validations:
required: false
- type: dropdown
id: version
attributes:
label: Version
description: What version of the Magento 2 integration you are using?
options:
- 1.0.0-rc.1
- 1.0.0-beta.14
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: dropdown
id: node
attributes:
label: What node version you were using?
multiple: false
options:
- 16.x
- 15.x
- 14.x
- 13.x
- 12.x
- 11.x
- 10.x
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/vuestorefront/magento2/blob/master/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Have a question or need help?
url: https://discord.gg/B9PVfxGy
about: Join our Vue Storefront - Discord Server for helping others, getting help, and more!
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/custom.md

This file was deleted.

20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/documentation-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "📚 Documentation Issue"
description: Report issues in our documentation
labels:
- documentation
- triage-needed
body:
- type: textarea
attributes:
label: Provide a description of requested docs changes
placeholder: Briefly describe which document needs to be corrected and why.
validations:
required: true
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/vuestorefront/magento2/blob/master/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: "🎉 Feature Request"
description: Sugest a new feature request or improvement on the project
title: '[Feature]: '
labels:
- feature
- triage-needed

body:
- type: markdown
attributes:
value: |
Please, provide as many information, and knowledge so the feature can be correctly designed and developed.
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. [email protected]
validations:
required: false
- type: textarea
id: suggestion
attributes:
label: How the project can be improved?
description: Can you tell us, how we can improve this project event more?
placeholder: Feature request
value: ""
validations:
required: true
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/vuestorefront/magento2/blob/master/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
83 changes: 83 additions & 0 deletions .github/workflows/docs-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Deploy Docs
on:
pull_request:
branches:
- release/*
- master
- develop

jobs:
build:
if: contains(github.event.pull_request.labels.*.name, 'documentation') && contains('bloodf|alefbarbeli|domideimel|LiorLindvor|filrak|filipsobol|andrzejewsky|', github.actor)
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v1
- shell: bash
run: |
echo "1.0.`date +%s`" > version.txt
- name: Upload version artifact
uses: actions/upload-artifact@v2
with:
name: version
path: version.txt
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::$(cat version.txt)
- name: Build and publish docker image
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: docs-storefrontcloud-io/v2-magento:${{ steps.get_version.outputs.VERSION }}
registry: registry.storefrontcloud.io
username: ${{ secrets.DOCS_CLOUD_USERNAME }}
password: ${{ secrets.DOCS_CLOUD_PASSWORD }}
workdir: docs
dockerfile: ../.vuestorefrontcloud/docker/docs/Dockerfile
buildoptions: "--compress"

deploy:
if: contains(github.event.pull_request.labels.*.name, 'release') && contains('bloodf|alefbarbeli|domideimel|LiorLindvor|filrak|filipsobol|andrzejewsky|', github.actor)
runs-on: ubuntu-latest
needs: build
steps:
- name: Download version artifact
uses: actions/download-artifact@v2
with:
name: version
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::$(cat version.txt)
- uses: chrnorm/deployment-action@releases/v1
name: Create GitHub deployment
id: deployment
with:
token: "${{ github.token }}"
target_url: https://docs.europe-west1.gcp.storefrontcloud.io/v2
environment: production
initial_status: in_progress
- name: Deploy on docs.europe-west1.gcp.storefrontcloud.io/magento
run: |
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-v2-magento","tag":"${{ steps.get_version.outputs.VERSION }}","image":"registry.storefrontcloud.io/docs-storefrontcloud-io/v2-magento","path":"/magento","port":"80"}]}}' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
echo "Instance updated"
else
echo "Something went wrong during the update process..."
exit 1
fi
- name: Update deployment status (success)
if: success()
uses: chrnorm/deployment-status@releases/v1
with:
token: "${{ github.token }}"
target_url: https://docs.europe-west1.gcp.storefrontcloud.io/v2
state: "success"
description: Congratulations! The deploy is done.
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
- name: Update deployment status (failure)
if: failure()
uses: chrnorm/deployment-status@releases/v1
with:
token: "${{ github.token }}"
target_url: https://docs.europe-west1.gcp.storefrontcloud.io/v2
description: Unfortunately, the instance hasn't been updated.
state: "failure"
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
2 changes: 1 addition & 1 deletion .github/workflows/gitflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- develop
jobs:
automerge:
if: contains(github.event.pull_request.labels.*.name, 'gitflow') && contains('bloodf|', github.actor)
if: contains(github.event.pull_request.labels.*.name, 'gitflow') && contains('bloodf|alefbarbeli|domideimel|LiorLindvor|filrak|filipsobol|andrzejewsky|', github.actor)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
Expand Down
Loading

0 comments on commit 1c4323e

Please sign in to comment.