diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..720848b9 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,64 @@ +# v1 +name: Theme CI +on: + workflow_dispatch: + push: + paths-ignore: + - '.github/**' + - 'docs/**' + - 'build/**' + - 'README.md' + - 'LICENSE' + branches: + [master, dev] + pull_request: + branches: + [master, dev] + +jobs: + ci: + runs-on: ubuntu-latest + env: + SONAR_TOKEN: ${{secrets.SONAR_TOKEN}} + GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} + BLOB_SAS: ${{ secrets.BLOB_TOKEN }} + + steps: + - uses: actions/checkout@v2 + + - name: Setup sonarqube + uses: warchant/setup-sonar-scanner@v1 + + - name: Get Image Version + uses: VirtoCommerce/vc-github-actions/get-image-version@dev + id: image + + - name: SonarCloud Scan + uses: VirtoCommerce/vc-github-actions/sonar-theme@dev + + - name: Build + uses: VirtoCommerce/vc-github-actions/build-theme@dev + + - name: Publish + id: publish + uses: VirtoCommerce/vc-github-actions/publish-theme@dev + + - name: Create Release + if: github.ref == 'refs/heads/master' + id: create_release + uses: actions/create-release@v1 + with: + tag_name: ${{ steps.image.outputs.tag }} + release_name: ${{ steps.image.outputs.tag }} + draft: false + prerelease: false + + - name: Upload Release Asset + if: github.ref == 'refs/heads/master' + id: upload-release-asset + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: ${{ steps.publish.outputs.artifactPath }} + asset_name: ${{ steps.publish.outputs.artifactName }} + asset_content_type: application/zip \ No newline at end of file diff --git a/assets/js/account/account-password-change.tpl.liquid b/assets/js/account/account-password-change.tpl.liquid index 08cafa32..64d91e28 100644 --- a/assets/js/account/account-password-change.tpl.liquid +++ b/assets/js/account/account-password-change.tpl.liquid @@ -11,17 +11,17 @@
- {{ 'customer.change_password.validation.current-password' | t }} + {{ 'customer.change_password.validation.current_password' | t }}
- {{ 'customer.change_password.validation.new-password' | t }} + {{ 'customer.change_password.validation.new_password' | t }}
- {{ 'customer.change_password.validation.repeat-password' | t }} + {{ 'customer.change_password.validation.repeat_password' | t }}
- diff --git a/snippets/product-compare.liquid b/snippets/product-compare.liquid index a3c5d0b7..ae0819a6 100644 --- a/snippets/product-compare.liquid +++ b/snippets/product-compare.liquid @@ -53,7 +53,8 @@ - - + + diff --git a/snippets/recently-added-actual-quote-request-item-dialog.liquid b/snippets/recently-added-actual-quote-request-item-dialog.liquid index 9989a791..0e382fda 100644 --- a/snippets/recently-added-actual-quote-request-item-dialog.liquid +++ b/snippets/recently-added-actual-quote-request-item-dialog.liquid @@ -36,9 +36,9 @@
-
diff --git a/templates/customers/register.liquid b/templates/customers/register.liquid index bd68add5..2123be50 100644 --- a/templates/customers/register.liquid +++ b/templates/customers/register.liquid @@ -12,10 +12,10 @@ {% include 'form-errors-custom' %} - + - + diff --git a/templates/quote-request.liquid b/templates/quote-request.liquid index b84e3da4..6d1d0cbd 100644 --- a/templates/quote-request.liquid +++ b/templates/quote-request.liquid @@ -69,6 +69,7 @@
+ {{ 'quotes.request.remove_items' | t }}
@@ -229,7 +230,7 @@ -
+
*