fix: Revert "ci: Run only API tests affected by changes in PRs and Up…

…grade GHA runners" (#2910)

.github/workflows/api-pull-request.yml

@@ -12,16 +12,14 @@ on:
       - .github/**
     branches:
       - main
-  merge_group:
-    types: [checks_requested]
 
 defaults:
   run:
     working-directory: api
 
 jobs:
   test:
-    runs-on: General-Purpose-8c-Runner
+    runs-on: ubuntu-latest
     name: API Unit Tests
 
     services:
@@ -35,7 +33,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     strategy:
-      max-parallel: 2
+      max-parallel: 4
       matrix:
         python-version: ['3.10', '3.11']
 
@@ -68,31 +66,11 @@ jobs:
           opts: --no-input --dry-run --check
         run: make django-make-migrations
 
-      - name: Restore cached testmon data
-        if: ${{ github.event_name == 'pull_request' }}
-        id: cache-testmon-restore
-        uses: actions/cache/restore@v3
-        with:
-          enableCrossOsArchive: true
-          path: |
-            /home/runner/work/flagsmith/flagsmith/api/.testmondata*
-          key: testmon-data-python${{ matrix.python-version }}-${{ github.event.pull_request.base.sha }}
-          restore-keys: testmon-data-python${{ matrix.python-version }}-
-
       - name: Run Tests
         env:
           DOTENV_OVERRIDE_FILE: .env-ci
         run: make test
 
-      - name: Save testmon data cache
-        id: cache-testmon-save
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            /home/runner/work/flagsmith/flagsmith/api/.testmondata*
-          key: testmon-data-python${{ matrix.python-version }}-${{github.sha}}
-
       - name: Upload Coverage
         uses: codecov/codecov-action@v3
         env:

api/.env-ci

@@ -1,3 +1,3 @@
 DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
 ANALYTICS_DATABASE_URL=postgres://postgres:postgres@localhost:5432/analytics
-PYTEST_ADDOPTS=--cov . --cov-report xml -n auto --dist worksteal --testmon
+PYTEST_ADDOPTS=--cov . --cov-report xml -n auto --dist worksteal

api/.gitignore

@@ -6,7 +6,4 @@ saml/
 features/workflows/logic/
 
 # Unit test coverage
-.coverage
-
-# pytest-testmon files
-.testmondata*
+.coverage

api/pyproject.toml

@@ -129,7 +129,6 @@ pip-tools = "~6.13.0"
 pytest-cov = "~4.1.0"
 datamodel-code-generator = "~0.22"
 requests-mock = "^1.11.0"
-pytest-testmon = "^2.0.13"
 
 [build-system]
 requires = ["poetry-core>=1.5.0"]