Skip to content

Commit afe8fda

Browse files
committed
Merge remote-tracking branch 'upstream/gcos4gnucobol-3.x' into bug961
2 parents d6b6724 + 3edbc6d commit afe8fda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+5688
-2767
lines changed

.github/workflows/build_nightly.yml

Lines changed: 701 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/macos.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- name: Configure git
2323
run: git config --global core.symlinks false
2424

25-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2625
- name: Checkout code
2726
uses: actions/checkout@v4
2827

@@ -57,17 +56,17 @@ jobs:
5756
--enable-hardening \
5857
--prefix /opt/cobol/gnucobol-gcos \
5958
59+
- name: make
60+
run: |
61+
make -C _build --jobs=$((${NPROC}+1))
62+
6063
- name: Upload config.log
6164
uses: actions/upload-artifact@v4
6265
with:
6366
name: config-${{ matrix.os }}.log
6467
path: _build/config.log
6568
if: failure()
6669

67-
- name: make
68-
run: |
69-
make -C _build --jobs=$((${NPROC}+1))
70-
7170
# make install must be done before make check, otherwise
7271
# execution of generated COBOL files fail for a missing
7372
# /usr/local/lib/libcob.dylib
@@ -89,7 +88,7 @@ jobs:
8988
9089
- name: Upload testsuite.log
9190
uses: actions/upload-artifact@v4
92-
if: failure()
91+
if: ${{ ! cancelled() }} #-> always upload as build result documentation
9392
with:
9493
name: testsuite-${{ matrix.os }}.log
9594
path: _build/tests/testsuite.log
@@ -102,7 +101,22 @@ jobs:
102101
save-always: true
103102
enableCrossOsArchive: true
104103

105-
- name: NIST85 Test Suite
104+
# - name: NIST85 Test Suite
105+
# run: |
106+
# make -C _build/tests/cobol85 EXEC85 test \
107+
# --jobs=$((${NPROC}+1))
108+
109+
- name: Run NIST85 testsuite
106110
run: |
107-
make -C _build/tests/cobol85 EXEC85 test \
108-
--jobs=$((${NPROC}+1))
111+
make -C _build/tests test --jobs=$((${NPROC}+1))
112+
113+
- name: Upload NIST85 Test Suite results
114+
if: ${{ ! cancelled() }} #-> always upload as build result documentation
115+
uses: actions/upload-artifact@v4
116+
with:
117+
name: NIST85 results on ${{ matrix.os }}
118+
path: |
119+
_build/tests/cobol85/summary.*
120+
_build/tests/cobol85/**/*.log
121+
_build/tests/cobol85/**/*.out
122+
_build/tests/cobol85/**/duration.txt

.github/workflows/ubuntu.yml

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)