VIDCS-3292: Push the new workflow and fixes to main

.github/workflows/auto-set-base.yml

@@ -0,0 +1,27 @@
+name: Auto-set Base Branch to Develop
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  set-base-branch:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Check and Update Base Branch
+        run: |
+          TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
+          BASE_BRANCH="${{ github.event.pull_request.head.ref }}"
+
+          if [ "$TARGET_BRANCH" = "main" ] && [ "$BASE_BRANCH" != "develop" ]; then
+            echo "Switching base branch from $TARGET_BRANCH to develop..."
+            gh pr edit ${{ github.event.pull_request.number }} --base develop
+            echo "Base branch updated to 'develop'."
+          else
+            echo "No changes needed: Target branch is '$TARGET_BRANCH' and base branch is '$BASE_BRANCH'."
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy-to-vcr.yml

@@ -3,7 +3,7 @@ name: Deploy to VCR
 on:
   pull_request:
     branches:
-      - main
+      - develop
     types: [closed]
 
 permissions:

.github/workflows/run-tests.yml

@@ -107,14 +107,14 @@ jobs:
           yarn test
 
       - name: SonarCloud Scan
-        if: steps.check-skip-ci.outputs.result == 'false'
+        if: steps.check-skip-ci.outputs.result == 'false' && github.event.pull_request.head.repo.fork == false
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
       - name: Run integration tests
-        if: steps.check-skip-ci.outputs.result == 'false'
+        if: steps.check-skip-ci.outputs.result == 'false' && github.event.pull_request.head.repo.fork == false
         run: |
           Xvfb :99 & export DISPLAY=:99
           yarn test:integration

backend/tests/helpers/blockCallsForArgs.test.ts → backend/tests/blockCallsForArgs.test.ts

@@ -1,7 +1,7 @@
 import util from 'util';
 import { describe, jest } from '@jest/globals';
-import blockCallsForArgs from '../../helpers/blockCallsForArgs';
-import delay from '../../helpers/delay';
+import blockCallsForArgs from '../helpers/blockCallsForArgs';
+import delay from '../helpers/delay';
 
 describe('blockCallsForArgs', () => {
   it('executes function with args', async () => {