Merge branch 'develop' into tests/dappland-banner

swapnilraj · Mar 31, 2023 · fcb83e3 · fcb83e3
2 parents da81415 + e550b80
commit fcb83e3
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 148 deletions.
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -24,7 +24,6 @@ jobs:
       ARGENT_X_STATUS_URL: ${{ secrets.ARGENT_X_STATUS_URL }}
       ARGENT_EXPLORER_BASE_URL: ${{ secrets.ARGENT_EXPLORER_BASE_URL }}
 
-    if: github.actor != 'dependabot[bot]'
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -39,6 +38,17 @@ jobs:
           node-version: "16"
           cache: "yarn"
 
+      - name: Install dependencies
+        run: yarn setup
+
+      - name: Install Playwright Browsers
+        run: npx playwright install chromium
+
+      - name: Build
+        run: yarn lerna run --scope @argent-x/extension build
+        env:
+          UPLOAD_SENTRY_SOURCEMAPS: false
+
       - name: Check docker local network
         run: |
           CODE=`curl --write-out '%{http_code}' \
@@ -55,17 +65,6 @@ jobs:
             echo "Local network is online."
           fi
 
-      - name: Install dependencies
-        run: yarn setup
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium
-
-      - name: Build
-        run: yarn lerna run --scope @argent-x/extension build
-        env:
-          UPLOAD_SENTRY_SOURCEMAPS: false
-
       - name: Run e2e tests
         run: xvfb-run --auto-servernum yarn test:e2e
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,6 @@ jobs:
       ARGENT_X_STATUS_URL: ${{ secrets.ARGENT_X_STATUS_URL }}
       ARGENT_EXPLORER_BASE_URL: ${{ secrets.ARGENT_EXPLORER_BASE_URL }}
 
-    if: github.actor != 'dependabot[bot]'
     steps:
       - name: If github.head_ref not filled, we are merging
         run: |
@@ -133,6 +132,7 @@ jobs:
         run: |
           gh pr comment ${{ env.GHA_BRANCH }} --body "[Builds for local testing](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
       - name: SonarCloud Scan
+        if: github.actor != 'dependabot[bot]'
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}