Merge pull request #3 from davi-lucciola/dev

Dev
davi-lucciola · Jul 19, 2024 · cecf7e4 · cecf7e4
2 parents 3685c9f + 81028d3
commit cecf7e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,12 +1,15 @@
 name: Continuos Integration - CI
 
 on: 
-  workflow_run:
-    workflows: ["Tests"]
-    types:
-      - completed
-    branches-ignore:
-      - "dev"
+  push:
+    branches: [main]
+
+  # workflow_run:
+  #   workflows: ["Tests"]
+  #   types:
+  #     - completed
+  #   branches-ignore:
+  #     - "dev"
 
 jobs:
   ci:
@@ -24,7 +27,9 @@ jobs:
 
       # API - Docker Image
       - name: Build Docker Image (API)
-        run: docker build ./server -t knockbank-api
+        run: |
+          cd server
+          docker build -t knockbank-api .
 
       - name: Push Docker Image (API)
         run: docker push davilucciola/knockbank-api:latest

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Tests
 
 on: 
   push:
-    branches: [main, dev]
+    branches: [dev]
 
 jobs:
   tests:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Tests @@
     on:
       push:
-        branches: [main, dev]
+        branches: [dev]
     jobs:
       tests:
@@ Expand Down @@