Add merge-branches step to CI (bigbluebutton#18728)

antonbsa · Sep 6, 2023 · 1d9cc4a · 1d9cc4a
1 parent a509985
commit 1d9cc4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ts-code-compilation.yml b/.github/workflows/ts-code-compilation.yml
@@ -15,7 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0 # Fetch all history
+          fetch-depth: 1
+      - name: Merge branches
+        uses: ./.github/actions/merge-branches
       - name: install meteor
         run: curl https://install.meteor.com/ | sh
       - name: run meteor npm install

diff --git a/.github/workflows/ts-code-validation.yml b/.github/workflows/ts-code-validation.yml
@@ -15,7 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0 # Fetch all history
+          fetch-depth: 1
+      - name: Merge branches
+        uses: ./.github/actions/merge-branches
       - name: install meteor
         run: curl https://install.meteor.com/ | sh
       - name: run meteor npm install