Skip to content

Commit 3d33736

Browse files
committed
Reuse eamxx-sa-testing workflow instead of adding a new one
1 parent 5da2ddc commit 3d33736

File tree

4 files changed

+32
-179
lines changed

4 files changed

+32
-179
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Composite action to update Kokkos to the current develop branch
2+
3+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Update Kokkos to develop branch
2+
description: Updates to Kokkos develop branch and append necessary cmake vars
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Check out develop branch in externals/ekat/extern/kokkos
8+
run: |
9+
cd externals/ekat/extern/kokkos
10+
if ! git remote | grep -q upstream; then
11+
git remote add upstream https://github.com/kokkos/kokkos.git
12+
fi
13+
git fetch upstream
14+
git checkout upstream/develop
15+
- name: Modify ghci-snl.cmake file
16+
run: |
17+
cmake_file="components/eamxx/cmake/machine-files/ghci-snl.cmake"
18+
echo "set(CMAKE_CXX_STANDARD 20)" >> $cmake_file
19+
echo "set(Kokkos_ENABLE_IMPL_VIEW_LEGACY ON)" >> $cmake_file
20+
echo "set(Kokkos_ENABLE_DEPRECATED_CODE_4 ON)" >> $cmake_file

.github/workflows/eamxx-kokkos-develop-testing.yml

Lines changed: 0 additions & 179 deletions
This file was deleted.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ on:
4545
# Add schedule trigger for nightly runs at midnight MT (Standard Time)
4646
schedule:
4747
- cron: '0 7 * * *' # Runs at 7 AM UTC, which is midnight MT during Standard Time
48+
- cron: '0 7 * * 1' # Weekly run every Monday at 7 AM UTC (using Kokkos develop branch)
4849

4950
concurrency:
5051
# Two runs are in the same group if they are testing the same git ref
@@ -59,6 +60,8 @@ env:
5960
generate: ${{ github.event_name == 'workflow_dispatch' && inputs.bless }}
6061
# Do EKAT testing for nightlies or (TODO: if EKAT label is present)
6162
ekat: ${{ github.event_name == 'schedule' }}
63+
# For the weekly run, we test using the kokkos develop branch
64+
kokkos_dev_test: ${{ github.event_name == 'schedule' && github.event.schedule == '0 7 * * 1' }}
6265

6366
jobs:
6467
gcc-openmp:
@@ -85,6 +88,9 @@ jobs:
8588
submodules: recursive
8689
- name: Show action trigger
8790
uses: ./.github/actions/show-workflow-trigger
91+
- name: Checkout Kokkos develop branch
92+
if: ${{ env.kokkos_dev_test }}
93+
uses: ./.github/actions/update-to-kokkos-develop
8894
- name: Run tests
8995
uses: ./.github/actions/test-all-eamxx
9096
with:
@@ -153,6 +159,9 @@ jobs:
153159
exit 1
154160
;;
155161
esac
162+
- name: Checkout Kokkos develop branch
163+
if: ${{ env.kokkos_dev_test }}
164+
uses: ./.github/actions/update-to-kokkos-develop
156165
- name: Run tests
157166
uses: ./.github/actions/test-all-eamxx
158167
with:

0 commit comments

Comments
 (0)