Merge pull request #4121 from novuhq/test-ref-submodule-branch

Build submodule package by branch
novuhq · Sep 10, 2023 · 41622c6 · 41622c6
2 parents e741310 + f6ac300
commit 41622c6
Show file tree

Hide file tree

Showing 20 changed files with 147 additions and 48 deletions.
diff --git a/.github/actions/checkout-submodules/action.yml b/.github/actions/checkout-submodules/action.yml
@@ -0,0 +1,28 @@
+name: Checkout Submodules
+
+description: Checkout private enterprise submodule
+
+inputs:
+  enabled:
+    description: 'Run the action'
+    required: false
+    default: 'true'
+  submodule_token:
+    description: 'Submodule token to use for checkout'
+    required: true
+  submodule_branch:
+    description: 'Submodule branch to checkout to'
+    required: true
+
+runs:
+  using: composite
+
+  steps:
+    - name: Checkout submodule
+      if: ${{ inputs.run == 'true' }}
+      uses: actions/checkout@v3
+      with:
+        token: ${{ inputs.submodule_token }}
+        repository: novuhq/packages-enterprise
+        path: enterprise/packages
+        ref: ${{ inputs.submodule_branch }}
diff --git a/.github/workflows/dev-deploy-api.yml b/.github/workflows/dev-deploy-api.yml
@@ -26,6 +26,7 @@ jobs:
     with:
       ee: ${{ contains (matrix.name,'ee') }}
       submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: "next"
     secrets: inherit
 
   deploy_dev_api:
@@ -45,9 +46,11 @@ jobs:
         name: ['novu/api-ee', 'novu/api']
     steps:
       - uses: actions/checkout@v3
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ contains (matrix.name,'ee') }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
+          enabled: ${{ contains (matrix.name,'ee') }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: "next"
       - uses: ./.github/actions/setup-project
       - uses: ./.github/actions/docker/build-api
         id: docker_build

diff --git a/.github/workflows/dev-deploy-inbound-mail.yml b/.github/workflows/dev-deploy-inbound-mail.yml
@@ -26,6 +26,7 @@ jobs:
     with:
       ee: ${{ contains (matrix.name,'ee') }}
       submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: "next"
     secrets: inherit
 
   dev_deploy_inbound_mail:

diff --git a/.github/workflows/dev-deploy-web.yml b/.github/workflows/dev-deploy-web.yml
@@ -20,6 +20,7 @@ jobs:
     uses: ./.github/workflows/reusable-web-e2e.yml
     with:
       submodules: true
+      submodule_branch: 'next'
     secrets: inherit
 
   # This workflow contains a single job called "build"

diff --git a/.github/workflows/dev-deploy-widget.yml b/.github/workflows/dev-deploy-widget.yml
@@ -21,6 +21,7 @@ jobs:
     uses: ./.github/workflows/reusable-widget-e2e.yml
     with:
       submodules: true
+      submodule_branch: "next"
     secrets: inherit
 
   # This workflow contains a single job called "build"

diff --git a/.github/workflows/dev-deploy-worker.yml b/.github/workflows/dev-deploy-worker.yml
@@ -30,6 +30,7 @@ jobs:
     with:
       ee: ${{ contains (matrix.name,'ee') }}
       submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: "next"
     secrets: inherit
 
   deploy_dev_worker:
@@ -49,9 +50,11 @@ jobs:
         name: ['novu/worker-ee', 'novu/worker']
     steps:
       - uses: actions/checkout@v3
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ contains (matrix.name,'ee') }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
+          enabled: ${{ contains (matrix.name,'ee') }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: "next"
       - uses: ./.github/actions/setup-project
       - uses: ./.github/actions/docker/build-worker
         id: docker_build

diff --git a/.github/workflows/dev-deploy-ws.yml b/.github/workflows/dev-deploy-ws.yml
@@ -22,6 +22,7 @@ jobs:
     with:
       ee: ${{ contains (matrix.name,'ee') }}
       submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: 'next'
     secrets: inherit
 
   # This workflow contains a single job called "build"

diff --git a/.github/workflows/prod-deploy-api.yml b/.github/workflows/prod-deploy-api.yml
@@ -15,6 +15,7 @@ jobs:
     with:
       ee: ${{ contains (matrix.name,'ee') }}
       submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: "main"
     secrets: inherit
 
   build_prod_image:
@@ -36,9 +37,11 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v3
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ contains (matrix.name,'ee') }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
+          enabled: ${{ contains (matrix.name,'ee') }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: "main"
       - uses: ./.github/actions/setup-project
 
       - name: build api

diff --git a/.github/workflows/prod-deploy-inbound-mail.yml b/.github/workflows/prod-deploy-inbound-mail.yml
@@ -6,6 +6,17 @@ on:
   workflow_dispatch:
 
 jobs:
+  test_inbound_mail:
+    strategy:
+      matrix:
+        name: [ 'novu/inbound-mail-ee', 'novu/inbound-mail' ]
+    uses: ./.github/workflows/reusable-inbound-mail-e2e.yml
+    with:
+      ee: ${{ contains (matrix.name,'ee') }}
+      submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: "main"
+    secrets: inherit
+
   build_prod_image:
     runs-on: ubuntu-latest
     timeout-minutes: 80

diff --git a/.github/workflows/prod-deploy-web.yml b/.github/workflows/prod-deploy-web.yml
@@ -13,6 +13,7 @@ jobs:
     uses: ./.github/workflows/reusable-web-e2e.yml
     with:
       submodules: true
+      submodule_branch: 'main'
     secrets: inherit
 
   deploy_web_eu:

diff --git a/.github/workflows/prod-deploy-widget.yml b/.github/workflows/prod-deploy-widget.yml
@@ -12,6 +12,7 @@ jobs:
     uses: ./.github/workflows/reusable-widget-e2e.yml
     with:
       submodules: true
+      submodule_branch: "main"
     secrets: inherit
 
   deploy_widget_eu:

diff --git a/.github/workflows/prod-deploy-worker.yml b/.github/workflows/prod-deploy-worker.yml
@@ -15,6 +15,7 @@ jobs:
     with:
       ee: ${{ contains (matrix.name,'ee') }}
       submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: "main"
     secrets: inherit
 
   build_prod_image:
@@ -37,9 +38,11 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v3
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ contains (matrix.name,'ee') }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
+          enabled: ${{ contains (matrix.name,'ee') }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: "main"
       - uses: ./.github/actions/setup-project
 
       - name: build worker

diff --git a/.github/workflows/prod-deploy-ws.yml b/.github/workflows/prod-deploy-ws.yml
@@ -6,6 +6,17 @@ on:
   workflow_dispatch:
 
 jobs:
+  test_ws:
+    strategy:
+      matrix:
+        name: [ 'novu/ws-ee', 'novu/ws' ]
+    uses: ./.github/workflows/reusable-ws-e2e.yml
+    with:
+      ee: ${{ contains (matrix.name,'ee') }}
+      submodules: ${{ contains (matrix.name,'ee') }}
+      submodule_branch: 'main'
+    secrets: inherit
+
   # This workflow contains a single job called "build"
   build_prod_image:
     # The type of runner that the job will run on

diff --git a/.github/workflows/reusable-api-e2e.yml b/.github/workflows/reusable-api-e2e.yml
@@ -15,6 +15,11 @@ on:
         required: false
         default: false
         type: boolean
+      submodule_branch:
+        description: 'Submodule branch to checkout to'
+        required: false
+        default: 'main'
+        type: string
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -39,15 +44,13 @@ jobs:
           else
             echo ::set-output has_token=false
           fi
-      # checkout with submodules if token is provided
       - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token == 'true'
+      # checkout with submodules if token is provided
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ inputs.submodules }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
-       # checkout without submodules
-      - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token != 'true'
+          enabled: ${{ steps.setup.outputs.has_token == 'true' }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: ${{ inputs.submodule_branch }}
       - uses: ./.github/actions/setup-project
       - uses: ./.github/actions/setup-redis-cluster
       - uses: mansagroup/nrwl-nx-action@v3

diff --git a/.github/workflows/reusable-inbound-mail-e2e.yml b/.github/workflows/reusable-inbound-mail-e2e.yml
@@ -14,6 +14,11 @@ on:
         required: false
         default: false
         type: boolean
+      submodule_branch:
+        description: 'Submodule branch to checkout to'
+        required: false
+        default: 'main'
+        type: string
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -33,14 +38,11 @@ jobs:
     steps:
       # checkout with submodules if token is provided
       - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token == 'true'
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ inputs.submodules }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
-
-      # checkout without submodules
-      - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token != 'true'
+          enabled: ${{ steps.setup.outputs.has_token == 'true' }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: ${{ inputs.submodule_branch }}
       - uses: ./.github/actions/setup-project
       - uses: ./.github/actions/setup-redis-cluster
       - uses: mansagroup/nrwl-nx-action@v3

diff --git a/.github/workflows/reusable-web-e2e.yml b/.github/workflows/reusable-web-e2e.yml
@@ -11,6 +11,11 @@ on:
         required: false
         default: false
         type: boolean
+      submodule_branch:
+        description: 'Submodule branch to checkout to'
+        required: false
+        default: 'main'
+        type: string
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -45,15 +50,13 @@ jobs:
             echo ::set-output has_token=false
           fi
 
-      # checkout with submodules if token is provided
       - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token == 'true'
+      # checkout with submodules if token is provided
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ inputs.submodules }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
-       # checkout without submodules
-      - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token != 'true'
+          enabled: ${{ steps.setup.outputs.has_token == 'true' }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: ${{ inputs.submodule_branch }}
       - uses: ./.github/actions/setup-project
         id: setup-project
         with:

diff --git a/.github/workflows/reusable-widget-e2e.yml b/.github/workflows/reusable-widget-e2e.yml
@@ -10,6 +10,11 @@ on:
         required: false
         default: false
         type: boolean
+      submodule_branch:
+        description: 'Submodule branch to checkout to'
+        required: false
+        default: 'main'
+        type: string
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -44,15 +49,13 @@ jobs:
           else
             echo ::set-output has_token=false
           fi
-      # checkout with submodules if token is provided
       - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token == 'true'
+      # checkout with submodules if token is provided
+      - uses: ./.github/actions/checkout-submodules
         with:
-          submodules: ${{ inputs.submodules }}
-          token: ${{ secrets.SUBMODULES_TOKEN }}
-       # checkout without submodules
-      - uses: actions/checkout@v3
-        if: steps.setup.outputs.has_token != 'true'
+          enabled: ${{ steps.setup.outputs.has_token == 'true' }}
+          submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+          submodule_branch: ${{ inputs.submodule_branch }}
 
       - uses: ./.github/actions/setup-project
         id: setup-project

diff --git a/.github/workflows/reusable-worker-e2e.yml b/.github/workflows/reusable-worker-e2e.yml
@@ -15,6 +15,11 @@ on:
         required: false
         default: false
         type: boolean
+      submodule_branch:
+        description: 'Submodule branch to checkout to'
+        required: false
+        default: 'main'
+        type: string
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -39,16 +44,15 @@ jobs:
         else
            echo ::set-output has_token=false
         fi
-    # checkout with submodules if token is provided
     - uses: actions/checkout@v3
-      if: steps.setup.outputs.has_token == 'true'
+    # checkout with submodules if token is provided
+    - uses: ./.github/actions/checkout-submodules
       with:
-        submodules: ${{ inputs.submodules }}
-        token: ${{ secrets.SUBMODULES_TOKEN }}
-      # checkout without submodules
-    - uses: actions/checkout@v3
-      if: steps.setup.outputs.has_token != 'true'
+        enabled: ${{ steps.setup.outputs.has_token == 'true' }}
+        submodule_token: ${{ secrets.SUBMODULES_TOKEN }}
+        submodule_branch: ${{ inputs.submodule_branch }}
     - uses: ./.github/actions/setup-project
+
     - uses: ./.github/actions/setup-redis-cluster
     - uses: mansagroup/nrwl-nx-action@v3
       with: