From 75906915b433f6b7e2dfab6fb4f2963a0537a130 Mon Sep 17 00:00:00 2001 From: Benjamin Intal Date: Wed, 29 Dec 2021 20:05:52 +0800 Subject: [PATCH] Run v3.1.1 tests on develop --- .github/workflows/e2e-test-wp57.yml | 10 +++++----- .github/workflows/e2e-test.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-test-wp57.yml b/.github/workflows/e2e-test-wp57.yml index c204ee75..a722a7b4 100644 --- a/.github/workflows/e2e-test-wp57.yml +++ b/.github/workflows/e2e-test-wp57.yml @@ -1,9 +1,9 @@ name: e2e-test-wp57 on: push: - branches: [ v3-commands, master ] + branches: [ master ] pull_request: - branches: [ v3-commands, master ] + branches: [ master ] jobs: test: @@ -20,12 +20,12 @@ jobs: - uses: actions/checkout@v2 # Checkout the Stackable Free repo. with: repository: 'gambitph/Stackable' # Stackable free repo - ref: 'master' # Branch to checkout + ref: 'develop' # Branch to checkout path: 'Stackable' - uses: actions/checkout@v2 # Checkout the Stackable Premium repo. with: repository: 'bfintal/Stackable-Premium' # Stackable premium repo - ref: 'master' # Branch to checkout + ref: 'develop' # Branch to checkout path: 'Stackable/pro__premium_only' token: '${{ secrets.ACCESS_KEY }}' @@ -38,7 +38,7 @@ jobs: # Check the current PHP version installed - name: Check PHP version run: php -v - + # Install all dependencies from composer.json - name: Install dependencies working-directory: Stackable diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index cf0685bc..9bd6765c 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -19,12 +19,12 @@ jobs: - uses: actions/checkout@v2 # Checkout the Stackable Free repo. with: repository: 'gambitph/Stackable' # Stackable free repo - ref: 'master' # Branch to checkout + ref: 'develop' # Branch to checkout path: 'Stackable' - uses: actions/checkout@v2 # Checkout the Stackable Premium repo. with: repository: 'bfintal/Stackable-Premium' # Stackable premium repo - ref: 'master' # Branch to checkout + ref: 'develop' # Branch to checkout path: 'Stackable/pro__premium_only' token: '${{ secrets.ACCESS_KEY }}' # ACCESS_KEY is stored in this repo's secrets for the workflow to be able to checkout the repo, it's a Personal access tokens generated by the repository owner (bfintal) in developer settings @@ -37,7 +37,7 @@ jobs: # Check the current PHP version installed - name: Check PHP version run: php -v - + # Install all dependencies from composer.json - name: Install dependencies working-directory: Stackable @@ -87,7 +87,7 @@ jobs: - name: Run Test Suite uses: cypress-io/github-action@v2 with: - command: npm run cy:run:parallel -- --machine-number=${{ matrix.containers }} --total-machines=${{ matrix.total-machines }} --spec=cypress/integration/v2/**/*.spec.js --browser=chrome --env=STACKABLE_PREMIUM_CODE=${{ secrets.STACKABLE_PREMIUM_CODE }},GITHUB_ACTIONS=1 --config=baseUrl=http://localhost:8889 + command: npm run cy:run:parallel -- --machine-number=${{ matrix.containers }} --total-machines=${{ matrix.total-machines }} --spec=cypress/integration/v3/**/*.spec.js --browser=chrome --env=STACKABLE_PREMIUM_CODE=${{ secrets.STACKABLE_PREMIUM_CODE }},GITHUB_ACTIONS=1 --config=baseUrl=http://localhost:8889 # STACKABLE_PREMIUM_CODE contains a premium license key for Stackable Premium - name: Upload E2E Test Results