Skip to content

Commit 848bab1

Browse files
authored
update GHA conditional to allow running on merge to main (#2868)
1 parent 72aef05 commit 848bab1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
44

55
jobs:
66
migrations:
7-
if: github.event_name != 'push' || github.event.repository.fork == true
7+
if: github.event_name != 'push' || github.event.repository.fork == true || github.ref == 'refs/heads/main'
88
runs-on: ubuntu-latest
99
services:
1010
postgres:
@@ -40,7 +40,7 @@ jobs:
4040
DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
4141

4242
test:
43-
if: github.event_name != 'push' || github.event.repository.fork == true
43+
if: github.event_name != 'push' || github.event.repository.fork == true || github.ref == 'refs/heads/main'
4444
runs-on: ubuntu-latest
4545
services:
4646
postgres:
@@ -92,4 +92,4 @@ jobs:
9292
DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
9393

9494
- name: Check coverage
95-
run: coverage report -m --fail-under=75
95+
run: coverage report -m --fail-under=75

.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
44

55
jobs:
66
collectstatic:
7-
if: github.event_name != 'push' || github.event.repository.fork == true
7+
if: github.event_name != 'push' || github.event.repository.fork == true || github.ref == 'refs/heads/main'
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out repository

0 commit comments

Comments
 (0)