Skip to content

Commit 59a42d3

Browse files
authored
Merge pull request #3102 from E3SM-Project/bartgol/workflows/fix-eamxx-workflows
2 parents 776a79a + deb0ceb commit 59a42d3

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/eamxx-sa-testing.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
relevant_paths: ${{ steps.check_paths.outputs.value }}
4545
labels: ${{ steps.get_labels.outputs.labels }}
4646
steps:
47-
- id: check_paths
47+
- name: Check files modified by PR
48+
id: check_paths
4849
run: |
4950
paths=(
5051
components/eamxx
@@ -74,14 +75,15 @@ jobs:
7475
echo "No relevant files touched by this PR."
7576
echo "value=false" >> $GITHUB_OUTPUT
7677
fi
77-
- id: get_labels
78+
- name: Retrieve PR labels
79+
id: get_labels
7880
run: |
7981
labels="${{ join(github.event.pull_request.labels.*.name, ',') }}"
8082
echo "labels=${labels}" >> $GITHUB_OUTPUT
8183
gcc-openmp:
8284
needs: [pre_process_pr]
8385
if: |
84-
github.event_name == 'schedule' ||
86+
success() && github.event_name == 'schedule' ||
8587
(
8688
github.event_name == 'pull_request' &&
8789
needs.pre_process_pr.outputs.relevant_paths=='true' &&
@@ -128,7 +130,7 @@ jobs:
128130
gcc-cuda:
129131
needs: [pre_process_pr]
130132
if: |
131-
github.event_name == 'schedule' ||
133+
success() && github.event_name == 'schedule' ||
132134
(
133135
github.event_name == 'pull_request' &&
134136
needs.pre_process_pr.outputs.relevant_paths=='true' &&

.github/workflows/eamxx-scripts-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
relevant_paths: ${{ steps.check_paths.outputs.value}}
2929
labels: ${{ steps.get_labels.outputs.labels }}
3030
steps:
31-
- id: check_paths
31+
- name: Check files modified by PR
32+
id: check_paths
3233
run: |
3334
paths=(
3435
components/eamxx/scripts
@@ -53,7 +54,8 @@ jobs:
5354
echo "No relevant files touched by this PR."
5455
echo "value=false" >> $GITHUB_OUTPUT
5556
fi
56-
- id: get_labels
57+
- name: Retrieve PR labels
58+
id: get_labels
5759
run: |
5860
labels="${{ join(github.event.pull_request.labels.*.name, ',') }}"
5961
echo "labels=${labels}" >> $GITHUB_OUTPUT

.github/workflows/eamxx-v1-testing.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
relevant_paths: ${{ steps.check_paths.outputs.value }}
3737
labels: ${{ steps.get_labels.outputs.labels }}
3838
steps:
39-
- id: check_paths
39+
- name: Check files modified by PR
40+
id: check_paths
4041
run: |
4142
paths=(
4243
components/eamxx
@@ -66,7 +67,8 @@ jobs:
6667
echo "No relevant files touched by this PR."
6768
echo "value=false" >> $GITHUB_OUTPUT
6869
fi
69-
- id: get_labels
70+
- name: Retrieve PR labels
71+
id: get_labels
7072
run: |
7173
labels="${{ join(github.event.pull_request.labels.*.name, ',') }}"
7274
echo "labels=${labels}" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)