Cache newcob.val instead of an archive

OCamlPro · Aug 28, 2024 · 5112b73 · 5112b73
1 parent ebbf921
commit 5112b73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 40 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -94,24 +94,14 @@ jobs:
           name: testsuite-${{ matrix.os }}.log
           path: _build/tests/testsuite.log
 
-      - name: Cache newcob.val.tar.gz
+      - name: Cache newcob.val
         uses: actions/cache@v4
-        id: newcob
         with:
-          path: tests/cobol85/newcob.val.tar.gz.cached
-          key: newcob
+          path: _build/tests/cobol85/newcob.val
+          key: newcob-val
           save-always: true
 
-      - name: Download newcob.val.tar.gz
-        if: steps.newcob.outputs.cache-hit != 'true'
-        run: |
-          make -C _build/tests/cobol85 newcob.val.tar.gz
-          ln   -f _build/tests/cobol85/newcob.val.tar.gz        \
-                         tests/cobol85/newcob.val.tar.gz.cached
-
       - name: NIST85 Test Suite
         run: |
-          ln   -f        tests/cobol85/newcob.val.tar.gz.cached \
-                         tests/cobol85/newcob.val.tar.gz
           make -C _build/tests/cobol85 EXEC85 test              \
-                         --jobs=$(($(nproc)+1))
+                         --jobs=$((${NPROC}+1))
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -102,25 +102,15 @@ jobs:
           if-no-files-found: error
           retention-days: 0
 
-      - name: Cache newcob.val.tar.gz
+      - name: Cache newcob.val
         uses: actions/cache@v4
-        id: newcob
         with:
-          path: tests/cobol85/newcob.val.tar.gz.cached
-          key: newcob
+          path: _build/tests/cobol85/newcob.val
+          key: newcob-val
           save-always: true
 
-      - name: Download newcob.val.tar.gz
-        if: steps.newcob.outputs.cache-hit != 'true'
-        run: |
-          make -C _build/tests/cobol85 newcob.val.tar.gz
-          ln   -f _build/tests/cobol85/newcob.val.tar.gz        \
-                         tests/cobol85/newcob.val.tar.gz.cached
-
       - name: NIST85 Test Suite
         run: |
-          ln   -f        tests/cobol85/newcob.val.tar.gz.cached           \
-                         tests/cobol85/newcob.val.tar.gz
           make -C _build/tests/cobol85 EXEC85 test \
                                        --jobs=$(($(nproc)+1))
 
@@ -200,25 +190,15 @@ jobs:
           name: coverage-${{ matrix.os }}
           path: _build/GnuCOBOL-**-coverage
 
-      - name: Cache newcob.val.tar.gz
+      - name: Cache newcob.val
         uses: actions/cache@v4
-        id: newcob
         with:
-          path: tests/cobol85/newcob.val.tar.gz.cached
-          key: newcob
+          path: _build/tests/cobol85/newcob.val
+          key: newcob-val
           save-always: true
 
-      - name: Download newcob.val.tar.gz
-        if: steps.newcob.outputs.cache-hit != 'true'
-        run: |
-          make -C _build/tests/cobol85 newcob.val.tar.gz
-          ln   -f _build/tests/cobol85/newcob.val.tar.gz        \
-                         tests/cobol85/newcob.val.tar.gz.cached
-
       - name: Extended coverage
         run: |
-          ln   -f        tests/cobol85/newcob.val.tar.gz.cached           \
-                         tests/cobol85/newcob.val.tar.gz
           make -C _build/tests/cobol85 EXEC85 test                        \
                          --jobs=$(($(nproc)+1))                           \
                          --keep-going