From f1ebc1ada116c70e230a161723faeb62f3f2a72b Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Mon, 3 Feb 2025 10:41:16 -0700
Subject: [PATCH 1/3] CI: workaround for push issue

---
 .github/workflows/continuous-integration-workflow.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index c6ec9ff..6e53650 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -26,6 +26,8 @@ jobs:
       docker-tag: ghcr.io/kokkos/ci-containers/${{ matrix.config.dockerfile }}:${{ matrix.config.tag }}
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout CI repo
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
@@ -75,11 +77,11 @@ jobs:
                 -DKokkos_ENABLE_OPENMP=ON && \
               cmake --build builddir --parallel 2 && \
               ctest --test-dir builddir --output-on-failure"
+          sed -i '26s/$/ /' ${{ matrix.config.dockerfile }} # workaround for kokkos/ci-containers#56 
       - name: Push the image into GitHub Container Registry
         uses: docker/build-push-action@v6
-        if: ${{ github.repository_owner == 'kokkos' && ( github.event_name == 'push' ||  github.event_name == 'schedule' ) }}
         with:
           tags: ${{ env.docker-tag }}
           file: ${{ matrix.config.dockerfile }}
           build-args: ${{ steps.build_args.outputs.args }}
-          push: true
+          push: ${{ github.repository_owner == 'kokkos' && ( github.event_name == 'push' ||  github.event_name == 'schedule' ) }}

From 65674b7e406a20bd3687386667096bf32f2c6106 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Tue, 4 Feb 2025 14:24:53 -0700
Subject: [PATCH 2/3] CI: add better comment

---
 .github/workflows/continuous-integration-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 6e53650..3900f38 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -77,7 +77,7 @@ jobs:
                 -DKokkos_ENABLE_OPENMP=ON && \
               cmake --build builddir --parallel 2 && \
               ctest --test-dir builddir --output-on-failure"
-          sed -i '26s/$/ /' ${{ matrix.config.dockerfile }} # workaround for kokkos/ci-containers#56 
+          sed -i '26s/$/ /' ${{ matrix.config.dockerfile }} # force rebuild by adding a space (kokkos/ci-containers#56) 
       - name: Push the image into GitHub Container Registry
         uses: docker/build-push-action@v6
         with:

From b59c25cacadb8883f1de116e8bc03e683fab62a6 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Tue, 4 Feb 2025 17:04:45 -0700
Subject: [PATCH 3/3] Update continuous-integration-workflow.yml

---
 .github/workflows/continuous-integration-workflow.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 3900f38..aea3b7c 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -26,8 +26,6 @@ jobs:
       docker-tag: ghcr.io/kokkos/ci-containers/${{ matrix.config.dockerfile }}:${{ matrix.config.tag }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout CI repo
-        uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
@@ -77,7 +75,6 @@ jobs:
                 -DKokkos_ENABLE_OPENMP=ON && \
               cmake --build builddir --parallel 2 && \
               ctest --test-dir builddir --output-on-failure"
-          sed -i '26s/$/ /' ${{ matrix.config.dockerfile }} # force rebuild by adding a space (kokkos/ci-containers#56) 
       - name: Push the image into GitHub Container Registry
         uses: docker/build-push-action@v6
         with:
@@ -85,3 +82,5 @@ jobs:
           file: ${{ matrix.config.dockerfile }}
           build-args: ${{ steps.build_args.outputs.args }}
           push: ${{ github.repository_owner == 'kokkos' && ( github.event_name == 'push' ||  github.event_name == 'schedule' ) }}
+          # workaround for kokkos/ci-containers#56
+          no-cache: true