merge-develop-to-public

.env.example

@@ -4,4 +4,8 @@ MOON_PAY_API_KEY=
 
 # Analytics
 MIX_PANEL_TOKEN=
-MIX_PANEL_EXPLORE_APP_TOKEN=
+MIX_PANEL_EXPLORE_APP_TOKEN=
+
+# only needed for E2E test
+# SEED_WORDS1= []
+# SEED_WORDS2= []

.github/workflows/build-rc.yml

@@ -50,7 +50,7 @@ jobs:
           if-no-files-found: error
   UItest:
     needs: [build]
-    name: UI Test ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
+    name: E2E Test ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
     timeout-minutes: 10
     runs-on: ubuntu-20.04
     strategy:
@@ -79,8 +79,11 @@ jobs:
         run: npm install playwright
       - name: Install Playwright Browsers
         run: npx playwright install chromium --with-deps
-      - name: Run UI test suite
-        run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+      - name: Run E2E test suite
+        env:
+          SEED_WORDS1: ${{ secrets.SEED_WORDS1 }}
+          SEED_WORDS2: ${{ secrets.SEED_WORDS2 }}
+        run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --grep-invert "#localexecution" --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
       - name: Upload Playwright report
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v3
@@ -122,7 +125,7 @@ jobs:
         with:
           name: html-report--attempt-${{ github.run_attempt }}
           path: playwright-report
-          retention-days: 5
+          retention-days: 4
 
   publish-rc:
     # TODO also keep the develop PR description up to date

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
       - develop
 jobs:
   build:
-    if: ${{ !startsWith(github.head_ref, 'release/') && !startsWith(github.head_ref, 'e2etest/')}}
+    if: ${{ !startsWith(github.head_ref, 'release/') && !startsWith(github.head_ref, 'e2etest/') && !github.event.pull_request.draft == true }}
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
@@ -40,15 +40,18 @@ jobs:
         run: npm run build --if-present
       - name: Install Playwright Browsers
         run: npx playwright install chromium --with-deps
-      - name: Run UI test suite
-        run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --grep "#smoketest" --reporter=html
+      - name: Run E2E test suite
+        env:
+          SEED_WORDS1: ${{ secrets.SEED_WORDS1 }}
+          SEED_WORDS2: ${{ secrets.SEED_WORDS2 }}
+        run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npm run e2etest:smoketest --reporter=html
       - name: Upload Playwright report
         if: always()
         uses: actions/upload-artifact@v3
         with:
           name: playwright-report
           path: playwright-report/
-          retention-days: 30
+          retention-days: 4
       - name: Save Filename
         run: |
           BRANCH_NAME=$(echo ${{ github.head_ref }} | sed 's/\//-/g')

.github/workflows/create-release-pr.yml

@@ -32,6 +32,7 @@ jobs:
       - id: run-create-release-pr-sh
         env:
           BUMP: ${{ inputs.bump }}
+          SOURCE_BRANCH: ${{ github.ref_name }}
           GH_TOKEN: ${{ github.token }}
         run: |
           # git config

.github/workflows/playwright.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    if: ${{ startsWith(github.head_ref, 'e2etest/') || github.event_name == 'workflow_dispatch' }}
+    if: ${{ (startsWith(github.head_ref, 'e2etest/') && github.event.pull_request && github.event.pull_request.draft == false) || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -40,11 +40,11 @@ jobs:
         with:
           name: web-extension1
           path: ./build
-          retention-days: 5
+          retention-days: 4
           if-no-files-found: error
   UItest:
     needs: [build]
-    name: UI Test ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
+    name: E2E Test ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
     timeout-minutes: 10
     runs-on: ubuntu-20.04
     strategy:
@@ -73,8 +73,11 @@ jobs:
         run: npm install playwright
       - name: Install Playwright Browsers
         run: npx playwright install chromium --with-deps
-      - name: Run UI test suite
-        run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+      - name: Run E2E test suite
+        env:
+          SEED_WORDS1: ${{ secrets.SEED_WORDS1 }}
+          SEED_WORDS2: ${{ secrets.SEED_WORDS2 }}
+        run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --grep-invert "#localexecution" --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
       - name: Upload Playwright report
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v3
@@ -116,4 +119,4 @@ jobs:
         with:
           name: html-report--attempt-${{ github.run_attempt }}
           path: playwright-report
-          retention-days: 5
+          retention-days: 4

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           PR_ID: ${{ github.event.pull_request.number }}
         run: |
           # update PR description
-          cat release.json | jq -r .body > body.md
+          cat scripts/release.json | jq -r .body > body.md
           echo -e "\n\nPublished latest release: $(cat release.json | jq -r .html_url)" >> body.md
           gh api \
             --method PATCH \
@@ -71,7 +71,7 @@ jobs:
       - id: download-latest-asset
         name: Download latest asset from rc
         run: |
-          ASSET_ID=$(cat releases.json | jq -r ".[] | select(.tag_name==\"$TAG_RC\") | .assets[0].id")
+          ASSET_ID=$(cat scripts/releases.json | jq -r ".[] | select(.tag_name==\"$TAG_RC\") | .assets[0].id")
           gh api \
             -H "Accept: application/octet-stream" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
@@ -96,14 +96,15 @@ jobs:
           git config user.name "GitHub Actions Bot"
           git config user.email "<>"
           # run shell script
+          cd scripts
           ./merge-to-remote.sh
       - id: copy-release-to-public
         name: Copy release to public remote
         env:
           REMOTE_REPO: xverse-web-extension
         run: |
           # publish the latest release on remote
-          cat release.json | jq -r .body > public-body.md
+          cat scripts/release.json | jq -r .body > public-body.md
           gh api \
             --method POST \
             -H "Accept: application/vnd.github+json" \

README.md

@@ -45,7 +45,7 @@ npm run e2etest
 If you only want to run the smoke test suite, run
 
 ```
-npm run smoketest
+npm run e2etest:smoketest
 ```
 
 If you want to run the e2e test in UI Mode: