Fix install step

kokkos · Jan 24, 2024 · 0deb0fb · 0deb0fb
1 parent 312009e
commit 0deb0fb
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -46,6 +46,9 @@ jobs:
 
       # TODO check if current build has a different Dockerfile
 
+      - name: Login in GitHub Containers Repository
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
       - name: Build image
         run: |
           docker build \
@@ -55,9 +58,6 @@ jobs:
             --progress=plain \
             docker/base/${{ matrix.backend }}
 
-      - name: Login in GitHub Containers Repository
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
       - name: Push image
         run: docker push ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend }}
 
@@ -99,23 +99,27 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Login in GitHub Containers Repository
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
       - name: Pull image
         run: docker pull ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }}
 
       - name: Configure
         run: |
           docker run -v ${{github.workspace}}:/work ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }} \
             cmake -B build \
+            -DCMAKE_INSTALL_PREFIX=/work/install \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
             -DCMAKE_CXX_STANDARD=17 \
             -DBUILD_TESTING=ON \
             -DKokkosFFT_INTERNAL_Kokkos=ON \
             ${{ matrix.backend.cmake_flags }} \
-            ${{ matrix.target.cmake_flags }} \
+            ${{ matrix.target.cmake_flags }}
 
       - name: Build
         run: |
-            docker run -v ${{github.workspace}}:/work ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }} \
+          docker run -v ${{github.workspace}}:/work ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }} \
             cmake --build build -j 2
 
       - name: Build image
@@ -129,14 +133,25 @@ jobs:
             .
         if: ${{ matrix.target.name }} == "native"
 
+      - name: Push image
+        run: docker push ghcr.io/cexa-project/kokkos-fft/tests_${{ matrix.backend.name }}
+        if: ${{ matrix.target.name }} == "native"
+
       - name: Install
         run: |
           docker run -v ${{github.workspace}}:/work ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }} \
-            ./install_test/bin/install_${{ matrix.backend.name }}.sh /tmp ${{ matrix.backend.name }}
+            cmake --install build
 
-      - name: Login in GitHub Containers Repository
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Configure test code
+        run: |
+          docker run -v ${{github.workspace}}:/work ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }} \
+            cmake -B /tmp/test \
+            -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
+            -DCMAKE_CXX_STANDARD=17 \
+            -DKokkosFFT_INTERNAL_Kokkos=ON \
+            ${{ matrix.backend.cmake_flags }} \
+            ${{ matrix.target.cmake_flags }}
 
-      - name: Push image
-        run: docker push ghcr.io/cexa-project/kokkos-fft/tests_${{ matrix.backend.name }}
-        if: ${{ matrix.target.name }} == "native"
+      - name: Build test code
+          docker run -v ${{github.workspace}}:/work ghcr.io/cexa-project/kokkos-fft/base_${{ matrix.backend.name }} \
+            cmake --build /tmp/test -j 2