Skip to content

Commit fc3bce0

Browse files
authored
ci: Revert - Enable merge queue checks. Run only changed tests. (#3173)
1 parent 0347fca commit fc3bce0

File tree

6 files changed

+4
-49
lines changed

6 files changed

+4
-49
lines changed

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

+3-25
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ on:
1212
- .github/**
1313
branches:
1414
- main
15-
merge_group:
16-
types: [checks_requested]
1715

1816
defaults:
1917
run:
2018
working-directory: api
2119

2220
jobs:
2321
test:
24-
runs-on: General-Purpose-8c-Runner
22+
runs-on: ubuntu-latest
2523
name: API Unit Tests
2624

2725
services:
@@ -35,7 +33,7 @@ jobs:
3533
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
3634

3735
strategy:
38-
max-parallel: 2
36+
max-parallel: 4
3937
matrix:
4038
python-version: ['3.10', '3.11']
4139

@@ -69,31 +67,11 @@ jobs:
6967
opts: --no-input --dry-run --check
7068
run: make django-make-migrations
7169

72-
- name: Restore cached testmon data
73-
if: ${{ github.event_name == 'pull_request' }}
74-
id: cache-testmon-restore
75-
uses: actions/cache/restore@v3
76-
with:
77-
enableCrossOsArchive: true
78-
path: |
79-
/home/runner/work/flagsmith/flagsmith/api/.testmondata*
80-
key: testmon-data-python${{ matrix.python-version }}-${{ github.event.pull_request.base.sha }}
81-
restore-keys: testmon-data-python${{ matrix.python-version }}-
82-
8370
- name: Run Tests
8471
env:
85-
DOTENV_OVERRIDE_FILE: "${{ github.event_name == 'pull_request' && '.env-ci-testmon' || '.env-ci' }}"
72+
DOTENV_OVERRIDE_FILE: .env-ci
8673
run: make test
8774

88-
- name: Save testmon data cache
89-
id: cache-testmon-save
90-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
91-
uses: actions/cache/save@v3
92-
with:
93-
path: |
94-
/home/runner/work/flagsmith/flagsmith/api/.testmondata*
95-
key: testmon-data-python${{ matrix.python-version }}-${{github.sha}}
96-
9775
- name: Upload Coverage
9876
uses: codecov/codecov-action@v3
9977
env:

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ checkstyle.txt
1010
.env*
1111
!.env-local
1212
!.env-ci
13-
!.env-ci-testmon
1413
.direnv
1514
.envrc
1615
.tool-versions

api/.env-ci-testmon

-3
This file was deleted.

api/.gitignore

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@ saml/
66
features/workflows/logic/
77

88
# Unit test coverage
9-
.coverage
10-
11-
# pytest-testmon files
12-
.testmondata*
9+
.coverage

api/poetry.lock

-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ requests-mock = "^1.11.0"
146146
django-extensions = "^3.2.3"
147147
pdbpp = "^0.10.3"
148148
django-capture-on-commit-callbacks = "^1.11.0"
149-
pytest-testmon = "^2.0.13"
150149
mypy-boto3-dynamodb = "^1.33.0"
151150

152151
[build-system]

0 commit comments

Comments
 (0)