From f900e0d0caa120bf7b8b8e3f5817de52ce44dfb2 Mon Sep 17 00:00:00 2001
From: Carl Pearson <cwpears@sandia.gov>
Date: Wed, 18 Dec 2024 15:55:02 -0700
Subject: [PATCH] ci: explicitly test against kokkos master for PR tests

---
 .github/workflows/linux.yaml | 8 ++++----
 .github/workflows/osx.yaml   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index 2d058ef8..87919338 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -13,7 +13,7 @@ on:
     types: [ opened, reopened, synchronize ]
 
 jobs:
-   Kokkos-040200-OpenMPI-OpenMP-Release:
+   Kokkos-master-OpenMPI-OpenMP-Release:
     env:
       KOKKOS_SRC: ${{ github.workspace }}/_deps/kokkos
       KOKKOS_BUILD: ${{ github.workspace }}/_deps/kokkos-build
@@ -43,7 +43,7 @@ jobs:
       - run: echo "This job's status is ${{ job.status }}."
       - name: Build Kokkos
         run: |
-          git clone https://github.com/kokkos/kokkos.git "$KOKKOS_SRC"
+          git clone https://github.com/kokkos/kokkos.git --branch master "$KOKKOS_SRC"
           cd "$KOKKOS_SRC" && git checkout 4.2.00
           cmake -S "$KOKKOS_SRC" -B "$KOKKOS_BUILD" -DCMAKE_INSTALL_PREFIX="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ARCH_NATIVE=ON
           cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install
@@ -54,7 +54,7 @@ jobs:
       - name: Test KokkosComm
         run: |
           ctest -V --test-dir "$COMM_BUILD"
-   Kokkos-040200-MPICH-OpenMP-Debug:
+   Kokkos-master-MPICH-OpenMP-Debug:
     env:
       KOKKOS_SRC: ${{ github.workspace }}/_deps/kokkos
       KOKKOS_BUILD: ${{ github.workspace }}/_deps/kokkos-build
@@ -75,7 +75,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build Kokkos
         run: |
-          git clone https://github.com/kokkos/kokkos.git "$KOKKOS_SRC"
+          git clone https://github.com/kokkos/kokkos.git --branch master "$KOKKOS_SRC"
           cd "$KOKKOS_SRC" && git checkout 4.2.00
           cmake -S "$KOKKOS_SRC" -B "$KOKKOS_BUILD" -DCMAKE_INSTALL_PREFIX="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_OPENMP=ON -DKokkos_ARCH_NATIVE=ON
           cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install
diff --git a/.github/workflows/osx.yaml b/.github/workflows/osx.yaml
index c2137abb..c1642bdc 100644
--- a/.github/workflows/osx.yaml
+++ b/.github/workflows/osx.yaml
@@ -13,7 +13,7 @@ on:
     types: [ opened, reopened, synchronize ]
 
 jobs:
-   Kokkos-040200-OpenMPI-Threads-Debug:
+   Kokkos-master-OpenMPI-Threads-Debug:
     env:
       KOKKOS_SRC: ${{ github.workspace }}/_deps/kokkos
       KOKKOS_BUILD: ${{ github.workspace }}/_deps/kokkos-build
@@ -37,7 +37,7 @@ jobs:
           ls ${{ github.workspace }}
       - name: Build Kokkos
         run: |
-          git clone https://github.com/kokkos/kokkos.git "$KOKKOS_SRC"
+          git clone https://github.com/kokkos/kokkos.git --branch master "$KOKKOS_SRC"
           cd "$KOKKOS_SRC" && git checkout 4.2.00
           cmake -S "$KOKKOS_SRC" -B "$KOKKOS_BUILD" -DCMAKE_INSTALL_PREFIX="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_THREADS=ON -DKokkos_ARCH_NATIVE=ON
           cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install
@@ -48,7 +48,7 @@ jobs:
       - name: Test KokkosComm
         run: |
           ctest -V --test-dir "$COMM_BUILD"
-   Kokkos-040200-MPICH-Threads-Release:
+   Kokkos-master-MPICH-Threads-Release:
     env:
       KOKKOS_SRC: ${{ github.workspace }}/_deps/kokkos
       KOKKOS_BUILD: ${{ github.workspace }}/_deps/kokkos-build
@@ -69,7 +69,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build Kokkos
         run: |
-          git clone https://github.com/kokkos/kokkos.git "$KOKKOS_SRC"
+          git clone https://github.com/kokkos/kokkos.git --branch master "$KOKKOS_SRC"
           cd "$KOKKOS_SRC" && git checkout 4.2.00
           cmake -S "$KOKKOS_SRC" -B "$KOKKOS_BUILD" -DCMAKE_INSTALL_PREFIX="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release -DKokkos_ENABLE_SERIAL=ON -DKokkos_ENABLE_THREADS=ON -DKokkos_ARCH_NATIVE=ON
           cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install