5656 github.event_name != 'pull_request' ||
5757 github.event.action != 'labeled' ||
5858 github.event.label.name == 'run-spark-3.4-tests' ||
59+
60+ github.event.label.name == 'run-spark-4.0-tests' ||
5961 github.event.label.name == 'run-spark-4.1-tests'
6062 steps :
6163 - uses : actions/checkout@v6
@@ -231,11 +233,15 @@ jobs:
231233 spark_4_0 :
232234 name : Spark SQL Tests (Spark 4.0)
233235 needs : changes
236+ # Main-only by default; PRs need the `run-spark-4.0-tests` label. Swapped
237+ # with spark_4_1 on the `oom` branch to validate the memory caps against
238+ # Spark 4.1 by default.
234239 if : |
235240 needs.changes.outputs.spark_4_0 == 'true' &&
236241 (github.event_name == 'push' ||
237242 github.event_name == 'workflow_dispatch' ||
238- github.event_name == 'pull_request')
243+ (github.event_name == 'pull_request' &&
244+ contains(github.event.pull_request.labels.*.name, 'run-spark-4.0-tests')))
239245 uses : ./.github/workflows/spark_sql_test_reusable.yml
240246 with :
241247 spark-short : ' 4.0'
@@ -245,13 +251,11 @@ jobs:
245251 spark_4_1 :
246252 name : Spark SQL Tests (Spark 4.1)
247253 needs : changes
248- # Main-only by default; PRs need the `run-spark-4.1-tests` label.
249254 if : |
250255 needs.changes.outputs.spark_4_1 == 'true' &&
251256 (github.event_name == 'push' ||
252257 github.event_name == 'workflow_dispatch' ||
253- (github.event_name == 'pull_request' &&
254- contains(github.event.pull_request.labels.*.name, 'run-spark-4.1-tests')))
258+ github.event_name == 'pull_request')
255259 uses : ./.github/workflows/spark_sql_test_reusable.yml
256260 with :
257261 spark-short : ' 4.1'
0 commit comments