Merge remote-tracking branch 'origin/next' into conditions-for-integr…

…ations

# Conflicts:
#	apps/web/src/pages/integrations/components/multi-provider/CreateProviderInstanceSidebar.tsx

.github/actions/checkout-submodules/action.yml

@@ -19,7 +19,7 @@ runs:
 
   steps:
     - name: Checkout submodule
-      if: ${{ inputs.run == 'true' }}
+      if: ${{ inputs.enabled == 'true' }}
       uses: actions/checkout@v3
       with:
         token: ${{ inputs.submodule_token }}

.github/workflows/dev-deploy-inbound-mail.yml

@@ -35,6 +35,11 @@ jobs:
     needs: test_inbound_mail
     timeout-minutes: 80
     environment: Development
+    permissions:
+      contents: read
+      packages: write
+      deployments: write
+      id-token: write
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       matrix:

.github/workflows/test.yml

@@ -227,11 +227,26 @@ jobs:
           targets: test:e2e
           projects: ${{matrix.projectName}}
 
+  check_submodule_token:
+    name: Check if the secret exists or not.
+    runs-on: ubuntu-latest
+    outputs:
+      has_token: ${{ steps.secret-check.outputs.has_token }}
+    steps:
+      - name: Check if secret exists
+        id: secret-check
+        run: |
+          if [[ -n "${{ secrets.SUBMODULES_TOKEN }}" ]]; then
+            echo "::set-output name=has_token::true"
+          else
+            echo "::set-output name=has_token::false"
+          fi
+  
   test_e2e_ee:
     name: Test E2E EE
     runs-on: ubuntu-latest
-    needs: [get-affected]
-    if:  ${{ fromJson(needs.get-affected.outputs.test-e2e-ee)[0] }}
+    needs: [get-affected, check_submodule_token]
+    if:  ${{ fromJson(needs.get-affected.outputs.test-e2e-ee)[0] && needs.check_submodule_token.outputs.has_token == 'true'  }}
     timeout-minutes: 80
     strategy:
       # One job for each different project and node version

apps/api/src/app/events/e2e/delay-events.e2e.ts

@@ -281,7 +281,7 @@ describe('Trigger event - Delay triggered events - /v1/events/trigger (POST)', f
       eventNumber: '2',
       sendAt: dateValue,
     });
-    await session.awaitRunningJobs(template?._id, true, 1);
+    await session.awaitRunningJobs(template?._id, true, 0);
 
     const messages = await messageRepository.find({
       _environmentId: session.environment._id,