Merge branch 'development' of https://github.com/codeinwp/neve into f…

…ix/issue_2922

� Conflicts:
�	languages/neve.pot

.github/ISSUE_TEMPLATE/Automated_test.md

@@ -1,6 +1,6 @@
 ---
 name: Automated test
-about: Suggest a test for a feature or functionality
+about: Suggest an automated test for a feature or functionality
 
 ---
 

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -7,13 +7,18 @@ about: Suggest a feature that we can implement.
 ### Description:
 <!-- Describe the requested feature in a clear and concise way. -->
 
+### Alternatives:
+<!-- If we don't implement this feature, what would be the best alternatives to achieve the same functionality? -->
+
+---------------
+
+_The fields below will be filled by the QA team after the triage phase. Please do not fill or remove them._
 ### User story:
-<!-- Describe at least one use case using a user story pattern. Example:
+<!-- Describes a use case using a user story pattern. Example:
 As a writer, I want to clear all distraction on-site, so the reader will focus only on text -->
 
-### Alternatives:
-<!-- If we don't implement this feature, what would be the best alternatives to achieve the same functionality? -->
+### Checklist Scenarios
+<!-- Describes scenarios that must be fulfilled to consider that the feature is done and ready to be merged. -->
 
-### Gherkin Scenarios
-<!-- Describe some scenarios in Gherkin syntax to help us understand when the feature is finished. You can find out more info about Gherkin here https://cucumber.io/docs/gherkin/step-organization/ 
-If you have any question feel free to reach @gutoslv -->
+### Testing instructions
+<!---- How to test that this feature was properly implemented. ---->

.github/workflows/build-dev-artifacts.yml

@@ -2,7 +2,7 @@ name: Build and test
 
 on:
   pull_request:
-    types: [opened, synchronize, ready_for_review]
+    types: [ opened, synchronize, ready_for_review ]
     branches-ignore:
       - "update_dependencies"
 jobs:
@@ -44,9 +44,6 @@ jobs:
         run: composer install --no-dev --prefer-dist --no-progress --no-suggest
       - name: Install yarn deps
         run: yarn install --frozen-lockfile
-      - name: Install Cypress yarn
-        working-directory: ./e2e-tests
-        run: yarn install --frozen-lockfile
       - name: Build files
         run: yarn run build
       - name: Create zip
@@ -67,6 +64,16 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           SOURCE_DIR: artifact/
           DEST_DIR: ${{ github.event.pull_request.base.repo.name }}-${{ steps.retrieve-branch-name.outputs.branch_name }}-${{ steps.retrieve-git-sha-8.outputs.sha8 }}/
+      - name: Upload Branch to S3
+        uses: jakejarvis/s3-sync-action@master
+        with:
+          args: --acl public-read --follow-symlinks --delete
+        env:
+          AWS_S3_BUCKET: ${{ secrets.AWS_DEV_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          SOURCE_DIR: artifact/
+          DEST_DIR: ${{ github.event.pull_request.base.repo.name }}-${{ steps.retrieve-branch-name.outputs.branch_name }}/
 
   comment-on-pr:
     name: Comment on PR with links to plugin ZIPs
@@ -140,16 +147,10 @@ jobs:
           - machines: 1
             specs: "editor/classic"
             envs: "classic-editor"
-          - machines: 2
-            specs: "editor/classic"
-            envs: "classic-editor"
           ## 2 machines for modern editor (Gutenberg)
           - machines: 1
             specs: "editor/modern"
             envs: "default"
-          - machines: 2
-            specs: "editor/modern"
-            envs: "default"
           ## 6 machines for customizer tests
           - machines: 1
             specs: "customizer"
@@ -178,16 +179,6 @@ jobs:
       ZIP_URL: "https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/neve.zip"
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        id: yarn-and-build-cache
-        with:
-          path: |
-            ~/.cache/Cypress
-            node_modules
-            ./e2e-tests/node_modules
-          key: ${{ runner.os }}-node_modules-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-build-
       - name: Install ${{ matrix.envs }} env for ${{ matrix.specs }} specs
         run: bash ./bin/envs/init.sh ${{ matrix.envs }} latest no "$ZIP_URL"
       - name: Run ${{ matrix.specs }} Cypress tests
@@ -201,7 +192,6 @@ jobs:
           working-directory: ./e2e-tests
           env: host=localhost,port=8080
           browser: chrome
-          install: ${{ ! steps.yarn-and-build-cache.outputs.cache-hit }}
           headless: true
           parallel: true
           group: e2e-${{ matrix.specs }}

.github/workflows/e2e-storybook.yml

@@ -26,7 +26,7 @@ jobs:
             ${{ runner.os }}-yarn-
       - name: Build Cypress
         working-directory: ./e2e-tests
-        run: yarn install
+        run:  yarn install --frozen-lockfile
       - name: Install and Build 🔧
         run: |
           yarn install --frozen-lockfile
@@ -35,4 +35,4 @@ jobs:
       - name: E2E Tests 🚀
         working-directory: ./e2e-tests
         run: |
-          yarn run cypress:storybook:run --key=${{ secrets.CYPRESS_RECORD_KEY }}
+          yarn run cypress:storybook:run --record --key=${{ secrets.CYPRESS_RECORD_KEY }}

.github/workflows/neve-sync-30.yml → .github/workflows/neve-sync-branches.yml

@@ -1,17 +1,17 @@
-name: Sync 30 branch
+name: Sync branches
 on:
   push:
     branches:
-      - 'development'
+      - 'master'
 jobs:
   sync-branch:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - name: Merge development -> new/3-0
+      - name: Merge master -> development
         uses: Codeinwp/merge-branch@master
         with:
           type: now
-          from_branch: development
-          target_branch: new/3-0
+          from_branch: master
+          target_branch: development
           github_token: ${{ secrets.BOT_TOKEN }}

.github/workflows/sync-qa.yml

@@ -15,7 +15,6 @@ jobs:
       SSH_PORT: ${{ secrets.SSH_PORT }}
       SSH_HOST: ${{ secrets.SSH_HOST }}
       QA_ROOT: ${{ secrets.QA_ROOT }}
-      STG_DEMOSITES_ROOT: ${{ secrets.STG_DEMOSITES_ROOT }}
       PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
       CYPRESS_INSTALL_BINARY: 0
     steps:
@@ -53,11 +52,6 @@ jobs:
           rsync -rc --delete --exclude-from="$GITHUB_WORKSPACE/.distignore" -e "ssh -i
           $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT"
           "$GITHUB_WORKSPACE/dist/neve/" $SSH_USERNAME@$SSH_HOST:$QA_ROOT
-      - name: Deploy to staging of demosites.io env
-        run: >
-          rsync -rc --delete --exclude-from="$GITHUB_WORKSPACE/.distignore" -e "ssh -i
-          $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT"
-          "$GITHUB_WORKSPACE/dist/neve/" "${SSH_USERNAME}@${SSH_HOST}:${STG_DEMOSITES_ROOT}themes/neve/"
       - name: Rebuild Neve Reference
         run: >
           ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no
@@ -70,10 +64,11 @@ jobs:
           target_url: http://qa-neve.themeisle.com/empty-site
           state: success
           deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-  empty-job:
-    runs-on: ubuntu-latest
-    if: success()
-    steps:
-      - name: Meep
-        run: |
-          echo "Nothing to do. This is a fork."
+      - name: Run staging demosites deploy
+        uses: pagely/action-deploy@v1
+        with:
+          PAGELY_DEPLOY_DEST: "/httpdocs/wp-content/themes/neve/"
+          PAGELY_INTEGRATION_SECRET: ${{secrets.PAGELY_INTEGRATION_SECRET}}
+          PAGELY_INTEGRATION_ID: ${{secrets.PAGELY_INTEGRATION_ID}}
+          PAGELY_APP_ID: ${{secrets.STG_DEMOSITES_PAGELY_APP_ID}}
+          PAGELY_WORKING_DIR: "${{github.workspace}}/dist/neve"

.github/workflows/test-npm.yml

@@ -55,5 +55,3 @@ jobs:
         env:
           CI_JOB_NUMBER: 1
         run: yarn run size
-      - name: Check translations
-        run: git diff --exit-code languages/neve.pot

.gitignore

@@ -17,3 +17,6 @@ assets/css/*
 style-main*
 dashboard/build/*
 inc/customizer/controls/react/bundle/*
+inc/admin/metabox/build
+languages/neve.pot
+/e2e-tests/cypress/screenshots/