using cache instead of export

Author: bendhouseart

.github/workflows/collect-test-data.yml

@@ -27,10 +27,17 @@ jobs:
           restore-keys: |
             test-data-
 
-      - name: Get test data if not cached
+      - name: Get and process test data
         if: steps.test-data-cache.outputs.cache-hit != 'true'
+        id: get-test-data
+        run: make get-test-data
+
+      - name: Calculate test data hash
+        id: test-data-hash
         run: |
-          make get-test-data
+          # Create a hash of all the test data files
+          find test/test_data -type f -exec sha256sum {} \; | sort | sha256sum | cut -d' ' -f1 > test_data_hash.txt
+          echo "hash=$(cat test_data_hash.txt)" >> $GITHUB_OUTPUT
 
       - name: Verify test data
         run: |

.github/workflows/docker-build-local.yml

@@ -15,43 +15,54 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    outputs:
-      images: ${{ steps.save-images.outputs.images }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Set repository name
         id: repo
         run: echo "REPO_NAME=$(basename $GITHUB_WORKSPACE)" >> $GITHUB_ENV
 
+      - name: Cache Docker images
+        uses: actions/cache@v4
+        id: docker-cache
+        with:
+          path: |
+            mongo.tar
+            api.tar
+            handler.tar
+            ui.tar
+          key: docker-local-images-${{ github.sha }}
+          restore-keys: |
+            docker-local-images-
+
       - name: Pull required images
+        if: steps.docker-cache.outputs.cache-hit != 'true'
         run: docker compose -f ${{ env.COMPOSE_FILE }} pull
 
       - name: Build services
+        if: steps.docker-cache.outputs.cache-hit != 'true'
         run: docker compose -f ${{ env.COMPOSE_FILE }} build
 
       - name: Save images
-        id: save-images
+        if: steps.docker-cache.outputs.cache-hit != 'true'
         run: |
           # Save images to tar files
           docker save mongo > mongo.tar
           docker save ${REGISTRY_PREFIX}/${REPO_NAME}-api:latest > api.tar
           docker save ${REGISTRY_PREFIX}/${REPO_NAME}-handler:latest > handler.tar
           docker save ${REGISTRY_PREFIX}/${REPO_NAME}-ui:latest > ui.tar
-          
-          # Upload as artifacts
-          echo "images=mongo.tar,api.tar,handler.tar,ui.tar" >> $GITHUB_OUTPUT
-          
-      - name: Upload images
-        uses: actions/upload-artifact@v4
+
+      - name: Upload Docker images cache
+        if: steps.docker-cache.outputs.cache-hit != 'true'
+        uses: actions/cache@v4
         with:
-          name: docker-images-local
           path: |
             mongo.tar
             api.tar
             handler.tar
             ui.tar
-          retention-days: 1
+          key: docker-images-${{ github.sha }}
 
       - name: Clean up
+        if: always()
         run: docker system prune -f 

.github/workflows/test-upload-local.yml

@@ -7,7 +7,7 @@ on:
       - completed
 
 jobs:
-  test:
+  Test-Local-Uploads:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
@@ -35,16 +35,23 @@ jobs:
       - name: Get test data if not cached
         if: steps.test-data-cache.outputs.cache-hit != 'true'
         run: |
-          cd test
-          make gettestdata
+          make get-test-data
 
-      - name: Download images
-        uses: actions/download-artifact@v4
+      - name: Cache Docker images
+        uses: actions/cache@v4
+        id: docker-cache
         with:
-          name: docker-images-local
-          path: .
+          path: |
+            mongo.tar
+            api.tar
+            handler.tar
+            ui.tar
+          key: docker-local-images-${{ github.event.workflow_run.head_sha }}
+          restore-keys: |
+            docker-local-images-
 
       - name: Load images
+        if: steps.docker-cache.outputs.cache-hit == 'true'
         run: |
           docker load < mongo.tar
           docker load < api.tar

test/cleantestdata

@@ -11,4 +11,4 @@ rm -rf .git/modules/test/test_data/dcm_qa_uih
 rm -rf .git/modules/test/test_data/dcm_qa_nih
 rm -rf .git/modules/test/test_data/petdicoms
 rm -rf test/test_data/mixed_dicoms
-rm -rf test/test_data
+rm -rf test/test_data