Skip to content

Commit 6239df6

Browse files
ci: Remove concurrency conflicts
1 parent 8fb5f22 commit 6239df6

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

.github/workflows/tidy3d-python-client-tests.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ on:
1212
description: 'local-tests'
1313
type: boolean
1414
default: false
15-
push:
16-
branches: [ develop, latest ]
1715
pull_request:
1816
branches:
1917
- latest
2018
- develop
2119
- 'pre/*'
2220
types: ['opened', 'reopened', 'synchronize', 'ready_for_review']
23-
pull_request_review:
24-
types: [submitted]
2521

2622
permissions:
2723
contents: read
@@ -89,17 +85,6 @@ jobs:
8985
fi
9086
fi
9187
92-
# If triggered by PR review and approved
93-
if [[ "$EVENT_NAME" == "pull_request_review" ]]; then
94-
if [[ "$REVIEW_STATE" == "approved" ]]; then
95-
local_tests=true
96-
remote_tests=true
97-
else
98-
local_tests=false
99-
remote_tests=false
100-
fi
101-
fi
102-
10388
# All PRs that have been triggered need local tests and approved ones need to re-run the remote tests
10489
if [[ "$EVENT_NAME" == "pull_request" ]]; then
10590
local_tests=true
@@ -144,7 +129,9 @@ jobs:
144129
verify-schema-change:
145130
name: verify-schema-change
146131
needs: determine-test-scope
147-
if: (( needs.determine-test-scope.outputs.local_tests == 'true' ) || ( needs.determine-test-scope.outputs.remote_tests == 'true' )) && (github.event_name == 'pull_request')
132+
if: |
133+
(( needs.determine-test-scope.outputs.local_tests == 'true' ) ||
134+
( needs.determine-test-scope.outputs.remote_tests == 'true' ))
148135
runs-on: ubuntu-latest
149136
container: ghcr.io/astral-sh/uv:debian
150137
defaults:
@@ -247,8 +234,8 @@ jobs:
247234
image: ghcr.io/astral-sh/uv:debian
248235
options: --user 31001:61001 # Required slurm-batch UID: slurm GID for tmp/ file removal
249236
concurrency:
250-
group: local-tests-${{ github.ref }}-${{ github.event_name }}-python-${{ matrix.python-version }}
251-
cancel-in-progress: true # Required so it does not use previous state
237+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name }-${{ matrix.python-version }}-local
238+
cancel-in-progress: true
252239
strategy:
253240
matrix:
254241
python-version: ['3.9', '3.13']
@@ -355,6 +342,9 @@ jobs:
355342
permissions:
356343
contents: read
357344
pull-requests: write
345+
concurrency:
346+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name }}-${{ matrix.platform }}-${{ matrix.python-version }}-remote
347+
cancel-in-progress: true
358348
strategy:
359349
matrix:
360350
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
@@ -366,10 +356,6 @@ jobs:
366356
PIP_ONLY_BINARY: gdstk
367357
MPLBACKEND: agg
368358

369-
concurrency:
370-
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event_name }}-${{ matrix.platform }}-${{ matrix.python-version }}-remote
371-
cancel-in-progress: true
372-
373359
steps:
374360
- uses: actions/checkout@v4
375361
with:

0 commit comments

Comments
 (0)