Merge branch 'main' into improve-dump

paulsengroup · Sep 27, 2023 · 89b2c6d · 89b2c6d
2 parents 9bc7525 + eb609fb
commit 89b2c6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build-dockerfile.yml b/.github/workflows/build-dockerfile.yml
@@ -107,7 +107,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ github.repository }},ghcr.io/${{ github.repository }}
           flavor: |
@@ -120,23 +120,23 @@ jobs:
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build Docker image and push to registries
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ${{ github.workspace }}
           push: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -78,9 +78,10 @@ jobs:
           echo "CMAKE_BUILD_PARALLEL_LEVEL=$ncpus" >> $GITHUB_ENV
           echo "CTEST_PARALLEL_LEVEL=$ncpus" >> $GITHUB_ENV
 
-      - name: Install deps with PIP
+      - name: Install deps
         run: |
           pip install -r requirements.txt
+          choco install ccache
 
       - name: Generate cache key
         id: cache-key