From 1b8bf715340cfada3397d16c12653e9e57d264cf Mon Sep 17 00:00:00 2001
From: clavedeluna <danalitovsky+git@gmail.com>
Date: Tue, 17 Oct 2023 12:47:54 -0300
Subject: [PATCH 1/3] separate integration tests in CI

---
 .github/workflows/integration_test.yml | 37 ++++++++++++++++++++++++++
 .github/workflows/test.yml             |  6 ++---
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/integration_test.yml

diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
new file mode 100644
index 00000000..e9977dbd
--- /dev/null
+++ b/.github/workflows/integration_test.yml
@@ -0,0 +1,37 @@
+name: Integration Tests
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Run pytest
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        python-version: ['3.10',  '3.11', '3.12']
+    steps:
+      - name: Set Up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Install Codemodder Package
+        run: pip install .
+      - name: Install Dependencies
+        run: pip install -r requirements/test.txt
+      - name: Run integration tests
+        run: make integration-test
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c5136291..2986810e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Test
+name: Unit Tests
 
 on:
   push:
@@ -18,7 +18,7 @@ jobs:
   test:
     name: Run pytest
     runs-on: ubuntu-20.04
-    timeout-minutes: 15
+    timeout-minutes: 10
     strategy:
       matrix:
         python-version: ['3.10',  '3.11', '3.12']
@@ -35,8 +35,6 @@ jobs:
         run: pip install -r requirements/test.txt
       - name: Run unit tests
         run: make test
-      - name: Run integration tests
-        run: make integration-test
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         env:

From ab8d3096a0c539764d919792347c1b03d3599ce0 Mon Sep 17 00:00:00 2001
From: clavedeluna <danalitovsky+git@gmail.com>
Date: Tue, 17 Oct 2023 13:12:24 -0300
Subject: [PATCH 2/3] up tiemout

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2986810e..97e134f1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
   test:
     name: Run pytest
     runs-on: ubuntu-20.04
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       matrix:
         python-version: ['3.10',  '3.11', '3.12']

From 68292bcd430c493563759772ca8fe53984d19bc9 Mon Sep 17 00:00:00 2001
From: clavedeluna <danalitovsky+git@gmail.com>
Date: Tue, 17 Oct 2023 13:16:26 -0300
Subject: [PATCH 3/3] update concurrency

---
 .github/workflows/integration_test.yml | 2 +-
 .github/workflows/test.yml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
index e9977dbd..8743845f 100644
--- a/.github/workflows/integration_test.yml
+++ b/.github/workflows/integration_test.yml
@@ -11,7 +11,7 @@ on:
       - develop
 
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 97e134f1..3b98325d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ on:
       - develop
 
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: