Merge pull request #23 from nmm0/19-add-spdlog

#19: external spdlog
sandialabs · Jun 6, 2024 · 5788fa7 · 5788fa7
2 parents eecf585 + adad292
commit 5788fa7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
@@ -28,6 +28,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
+        if: ${{ github.ref == 'refs/heads/ci-images' }}
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -36,13 +37,24 @@ jobs:
       - name: Pull Cached Image
         run: docker pull ${{ env.IMAGE_TAG }}
         continue-on-error: true
+
+      - name: Build Docker images for PR testing
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ${{ matrix.image }}.dockerfile
+          cache-from: type=registry,ref=docker.io/${{ env.CACHE_TAG }}
+          push: false
+          tags: ${{ env.IMAGE_TAG }}
 
-      - name: Build and push Docker images
+      - name: Build and push Docker images on main
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/ci-images' }}
         uses: docker/build-push-action@v4
         with:
           context: .
           file: ${{ matrix.image }}.dockerfile
           cache-from: type=registry,ref=docker.io/${{ env.CACHE_TAG }}
           cache-to: type=registry,ref=docker.io/${{ env.CACHE_TAG }},mode=max
-          push: ${{ (github.event_name == 'push' || github.ref == 'refs/heads/ci-images') && 'true' || 'false' }}
+          push: true
           tags: ${{ env.IMAGE_TAG }}
diff --git a/spack.yaml b/spack.yaml
@@ -6,6 +6,7 @@ spack:
     - core-packages:
       - [email protected] +openmp +serial
       - [email protected]
+      - [email protected]
     - packages:
       - p3a@main
       - seacas@2024-04-03 -x11 ^[email protected] ^[email protected]

diff --git a/ubuntu20.04-gcc11-x64.dockerfile b/ubuntu20.04-gcc11-x64.dockerfile
@@ -49,7 +49,7 @@ RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.22.0" https:/
 COPY . /opt/src/ci-images
 
 # Get the latest version of the darma-vt repo
-RUN cd /opt/src/ci-images/spack-repos && git clone https://github.com/DARMA-tasking/spack-package.git vt
+RUN cd /opt/src/ci-images/spack-repos && git clone --depth 1 --branch "16-external-fmt" https://github.com/DARMA-tasking/spack-package.git vt
 
 # Add our new repos
 RUN . /opt/spack/share/spack/setup-env.sh \