Merge branch 'main' into app/feat/setup-testing

WatchItDev · Feb 7, 2025 · 10f5889 · 10f5889
2 parents c86918b + c6701c4
commit 10f5889
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,6 +30,9 @@ jobs:
 
       - name: Test
         run: npm run test
+
+      - name: Generate coverage report
+        run: npm run test:coverage
 
       - name: Coverage
         run: npm run test:coverage
@@ -38,3 +41,4 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          slug: WatchItDev/watchit-app
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -5,11 +5,11 @@ on:
     branches:
       - next
 jobs:
-  # Continuous-Integration:
-  #   uses: ./.github/workflows/ci.yml
-  #   secrets: inherit
+  Continuous-Integration:
+    uses: ./.github/workflows/ci.yml
+    secrets: inherit
   Create-Release:
-    # needs: [Continuous-Integration]
+    needs: [Continuous-Integration]
     uses: ./.github/workflows/release.yml
     permissions:
       contents: write # to be able to publish a GitHub release

diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -1,14 +1,15 @@
-name: Release CI/CD
+name: Main CI/CD
 # https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs
 on:
   push:
     branches:
       - main
 jobs:
-  # Continuous-Integration:
-  #   uses: ./.github/workflows/ci.yml
-  #   secrets: inherit
+  Continuous-Integration:
+    uses: ./.github/workflows/ci.yml
+    secrets: inherit
   Deploy-App:
+    needs: [Continuous-Integration]
     uses: ./.github/workflows/cd.yml
     secrets: inherit
     with: