wip: trying a composite solution to get caching to work better

FreeAndFair · Dec 9, 2024 · 873b69e · 873b69e
1 parent 8428ae5
commit 873b69e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/.github/workflows/main.hub.push.yml → .github/workflows/dockerhub-image.yml b/.github/workflows/main.hub.push.yml → .github/workflows/dockerhub-image.yml
@@ -1,12 +1,8 @@
-name: Push DockerHub Build
+name: Build and Push (on main only) DockerHub Build
 
 on:
   push:
-    branches: dockerhub-multiplatform # will be main when merged
-    # will be conditional on paths when merged
-    #paths: 
-    #  - Makefile
-    #  - Dockerfile.hub
+  workflow_dispatch:
 
 jobs:
   build:
@@ -37,7 +33,7 @@ jobs:
           cache-to: type=gha,mode=max
           file: Dockerfile.hub
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.ref_name == 'dockerhub-multiplatform' }} # will be main when merged
           tags: |
             freeandfair/sysmlv2-jupyter:latest
             freeandfair/sysmlv2-jupyter:${{ steps.sysmlv2-version.outputs.SYSML_VERSION }}
diff --git a/.github/workflows/pr.hub.test.yml b/.github/workflows/pr.hub.test.yml