Merge branch 'master' into dependabot/npm_and_yarn/dhis2/cli-app-scri…

…pts-11.7.2
dhis2 · Oct 8, 2024 · 4504ae1 · 4504ae1
2 parents 91fe23e + 6d5c1cd
commit 4504ae1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
@@ -90,7 +90,7 @@ jobs:
     call-workflow-e2e-prod:
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
         needs: [build, lint, test, setup-matrix]
-        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master
+        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@feat/support-hardcoded-dev-version
         with:
             should_record: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record')}}
             spec-group: ${{ needs.setup-matrix.outputs.matrix }}

diff --git a/jest.config.js b/jest.config.js
@@ -36,10 +36,13 @@ const reportPortalConfig = [
     },
 ]
 
+const isDependabotPR = process.env.GITHUB_ACTOR === 'dependabot[bot]'
+
 const isReportPortalSetup =
     process.env.REPORTPORTAL_API_KEY !== undefined &&
     process.env.REPORTPORTAL_ENDPOINT !== undefined &&
-    process.env.REPORTPORTAL_PROJECT !== undefined
+    process.env.REPORTPORTAL_PROJECT !== undefined &&
+    !isDependabotPR
 
 module.exports = {
     transformIgnorePatterns: [