Merge remote-tracking branch 'upstream/gcos4gnucobol-3.x' into bug961

OCamlPro · Nov 18, 2024 · afe8fda · afe8fda
2 parents d6b6724 + 3edbc6d
commit afe8fda
Show file tree

Hide file tree

Showing 73 changed files with 5,688 additions and 2,767 deletions.
diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -22,7 +22,6 @@ jobs:
       - name: Configure git
         run: git config --global core.symlinks false
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -57,17 +56,17 @@ jobs:
                        --enable-hardening \
                        --prefix /opt/cobol/gnucobol-gcos \
 
+      - name: make
+        run: |
+          make -C _build --jobs=$((${NPROC}+1))
+
       - name: Upload config.log
         uses: actions/upload-artifact@v4
         with:
           name: config-${{ matrix.os }}.log
           path: _build/config.log
         if: failure()
 
-      - name: make
-        run: |
-          make -C _build --jobs=$((${NPROC}+1))
-
       # make install must be done before make check, otherwise
       # execution of generated COBOL files fail for a missing
       # /usr/local/lib/libcob.dylib
@@ -89,7 +88,7 @@ jobs:
 
       - name: Upload testsuite.log
         uses: actions/upload-artifact@v4
-        if: failure()
+        if: ${{ ! cancelled() }}  #-> always upload as build result documentation
         with:
           name: testsuite-${{ matrix.os }}.log
           path: _build/tests/testsuite.log
@@ -102,7 +101,22 @@ jobs:
           save-always: true
           enableCrossOsArchive: true
 
-      - name: NIST85 Test Suite
+#      - name: NIST85 Test Suite
+#        run: |
+#          make -C _build/tests/cobol85 EXEC85 test              \
+#                         --jobs=$((${NPROC}+1))
+
+      - name: Run NIST85 testsuite
         run: |
-          make -C _build/tests/cobol85 EXEC85 test              \
-                         --jobs=$((${NPROC}+1))
+          make -C _build/tests test --jobs=$((${NPROC}+1))
+
+      - name: Upload NIST85 Test Suite results
+        if: ${{ ! cancelled() }}  #-> always upload as build result documentation
+        uses: actions/upload-artifact@v4
+        with:
+          name: NIST85 results on ${{ matrix.os }}
+          path: |
+            _build/tests/cobol85/summary.*
+            _build/tests/cobol85/**/*.log
+            _build/tests/cobol85/**/*.out
+            _build/tests/cobol85/**/duration.txt
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml