diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 62b8f5fa3..92a0bdd6d 100644 --- 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 index 4a3f1e8bc..24493570e 100644 --- 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