diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a8851be5..f1c83252 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -1,4 +1,4 @@ -name: MacOS +name: MacOS Workflow on: pull_request: @@ -7,123 +7,124 @@ on: # manual run in actions tab - for all branches workflow_dispatch: +env: + HOMEBREW_ROOT: /opt/homebrew/opt + jobs: build: + #runs-on: macos-latest-large # macos 14, amd64 + runs-on: macos-latest # macos 14, arm64 + timeout-minutes: 10 strategy: fail-fast: false matrix: - os: - # - macos-latest-large # macos 14, amd64 - - macos-latest # macos 14, arm64 isam: - db - visam - runs-on: ${{ matrix.os }} - steps: - - name: Configure git - run: git config --global core.symlinks false - - name: Set git user run: | git config --global user.name github-actions git config --global user.email github-actions-bot@users.noreply.github.com + # Why was this necessary ? Works fine without it... + # - name: Configure git + # run: git config --global core.symlinks false + - name: Checkout code uses: actions/checkout@v4 + - name: Setup build environment + run: | + echo "TERM=vt100" >> $GITHUB_ENV + echo "NPROC=`sysctl -n hw.ncpu`" >> $GITHUB_ENV + - name: Install packages run: | - brew install pkg-config automake libtool help2man texinfo bison berkeley-db@4 json-c - opt="/opt/homebrew/opt" - echo "$opt/pkg-config/bin" >> $GITHUB_PATH - echo "$opt/bison/bin" >> $GITHUB_PATH - echo "LDFLAGS=-L$opt/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV - echo "CPPFLAGS=-I$opt/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV - - - name: Installing VISAM prerequisite + brew update + brew install autoconf automake libtool bison \ + help2man texinfo \ + berkeley-db@4 json-c + echo "$HOMEBREW_ROOT/bison/bin" >> $GITHUB_PATH + echo "LDFLAGS=-L$HOMEBREW_ROOT/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV + echo "CPPFLAGS=-I$HOMEBREW_ROOT/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV + + - name: Install VISAM if: ${{ matrix.isam == 'visam' }} run: | - wget http://inglenet.ca/Products/GnuCOBOL/visam-2.2.tar.Z + curl -LO http://inglenet.ca/Products/GnuCOBOL/visam-2.2.tar.Z tar -xvzf visam-2.2.tar.Z cd visam-2.2 - ./configure --prefix=/usr/local/visam-2.2 --enable-vbisamdefault + ./configure --prefix=/opt/visam --enable-vbisamdefault chmod u+x build_aux/install-sh - make - sudo make install - echo "CPATH=/usr/local/visam-2.2/include" >> $GITHUB_ENV - echo "LIBRARY_PATH=/usr/local/visam-2.2/lib" >> $GITHUB_ENV - echo "LD_LIBRARY_PATH=/usr/local/visam-2.2/lib" >> $GITHUB_ENV + make && sudo make install + echo "CPATH=/opt/visam/include" >> $GITHUB_ENV + echo "LIBRARY_PATH=/opt/visam/lib" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=/opt/visam/lib" >> $GITHUB_ENV - - name: bootstrap - run: | - ./build_aux/bootstrap install - - - name: Build environment setup - run: | - mkdir _build - echo "NPROC=`sysctl -n hw.ncpu`" >> $GITHUB_ENV - export TERM="vt100" - echo "TERM=$TERM" >> $GITHUB_ENV + - name: Bootstrap GnuCOBOL + run: ./build_aux/bootstrap install - - name: configure + - name: Configure GnuCOBOL run: | - cd _build - export CPPFLAGS="-DREAD_WRITE_NEEDS_FLUSH $CPPFLAGS" - export CFLAGS="-Wno-unused-command-line-argument -Wno-deprecated-non-prototype -Wno-parentheses-equality $CFLAGS" + mkdir _build && cd _build ../configure --with-${{ matrix.isam }} \ --with-indexed=${{ matrix.isam }} \ --enable-cobc-internal-checks \ --enable-hardening \ - --prefix /opt/cobol/gnucobol + --prefix=/opt/cobol/gnucobol \ + CPPFLAGS="-DREAD_WRITE_NEEDS_FLUSH $CPPFLAGS" \ + CFLAGS="-Wno-unused-command-line-argument -Wno-parentheses-equality $CFLAGS" + + - name: Build GnuCOBOL + run: make -C _build --jobs=$((${NPROC}+1)) - - name: Upload config-${{ matrix.os }}-${{ matrix.isam }}.log + - name: Upload config-${{ matrix.isam }}.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 - if: failure() with: - name: config-${{ matrix.os }}-${{ matrix.isam }}.log + name: config-${{ matrix.isam }}.log path: _build/config.log - - name: make - run: | - make -C _build --jobs=$((${NPROC}+1)) - - # make install must be done before make check, otherwis - # execution of generated COBOL files fail for a missing - # /usr/local/lib/libcob.dylib - - name: make install + # make install must be done before make check, otherwise execution of + # generated COBOL files fail for a missing /usr/local/lib/libcob.dylib + - name: Install GnuCOBOL run: | sudo make -C _build install find /opt/cobol > _build/install.log - - name: Upload install-${{ matrix.os }}-${{ matrix.isam }}.log + - name: Upload install-${{ matrix.isam }}.log uses: actions/upload-artifact@v4 with: - name: install-${{ matrix.os }}-${{ matrix.isam }}.log + name: install-${{ matrix.isam }}.log path: _build/install.log - - name: check + - name: Adjust testsuite + run: | + cd tests/testsuite.src + sed -i '' '/AT_SETUP(\[INDEXED file SUPPRESS WHEN ALL \+ KEYCHECK\])/a \ + AT_SKIP_IF(\[true\])' run_file.at + sed -i '' '/AT_SETUP(\[EXTFH: using ISAM callback\])/a \ + AT_SKIP_IF(\[true\])' run_file.at + sed -i '' '/AT_SETUP(\[trace feature\])/a \ + AT_SKIP_IF(\[true\])' run_file.at + sed -i '' '/AT_SETUP(\[trace feature with subroutine\])/a \ + AT_SKIP_IF(\[true\])' run_file.at + sed -i '' '/AT_SETUP(\[trace feature with indexed EXTFH\])/a \ + AT_SKIP_IF(\[true\])' run_file.at + + - name: Run testsuite run: | - sed -i '' '/AT_SETUP(\[INDEXED file SUPPRESS WHEN ALL \+ KEYCHECK\])/a\ - AT_SKIP_IF(\[true\])' tests/testsuite.src/run_file.at - sed -i '' '/AT_SETUP(\[EXTFH: using ISAM callback\])/a\ - AT_SKIP_IF(\[true\])' tests/testsuite.src/run_file.at - sed -i '' '/AT_SETUP(\[trace feature\])/a\ - AT_SKIP_IF(\[true\])' tests/testsuite.src/run_file.at - sed -i '' '/AT_SETUP(\[trace feature with subroutine\])/a\ - AT_SKIP_IF(\[true\])' tests/testsuite.src/run_file.at - sed -i '' '/AT_SETUP(\[trace feature with indexed EXTFH\])/a\ - AT_SKIP_IF(\[true\])' tests/testsuite.src/run_file.at - make -C _build check \ - TESTSUITEFLAGS="--jobs=$((${NPROC}+1))" - - - name: Upload testsuite-${{ matrix.os }}-${{ matrix.isam }}.log + make -C _build check TESTSUITEFLAGS="--jobs=$((${NPROC}+1))" || \ + make -C _build check TESTSUITEFLAGS="--recheck --verbose" + + - name: Upload testsuite-${{ matrix.isam }}.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 - if: failure() with: - name: testsuite-${{ matrix.os }}-${{ matrix.isam }}.log + name: testsuite-${{ matrix.isam }}.log path: _build/tests/testsuite.log - name: Cache newcob.val @@ -131,10 +132,18 @@ jobs: with: path: _build/tests/cobol85/newcob.val key: newcob-val - save-always: true enableCrossOsArchive: true - - name: NIST85 Test Suite - run: | - make -C _build/tests/cobol85 EXEC85 test \ - --jobs=$((${NPROC}+1)) + - name: Run NIST85 testsuite + run: make -C _build test --jobs=$((${NPROC}+1)) + + - name: Upload NIST85 Test Suite results + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: NIST85 results on ${{ matrix.isam }} + 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 index 002f0a33..77b79eac 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,4 +1,4 @@ -name: Ubuntu +name: Build, Test and provide Nightly (Ubuntu + MSYS1) on: pull_request: @@ -9,18 +9,15 @@ on: jobs: build: - name: Build, test and provide nightly + runs-on: ubuntu-latest + timeout-minutes: 10 strategy: fail-fast: false matrix: - os: - - ubuntu-latest isam: - db - visam - runs-on: ${{ matrix.os }} - steps: - name: Set git user @@ -31,94 +28,92 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Setup build environment + run: echo "TERM=vt100" >> $GITHUB_ENV + - name: Install packages run: | - sudo apt-get update - sudo apt-get install automake libtool libdb5.3-dev libxml2-dev libcjson-dev \ - bison flex help2man gettext texlive autopoint + sudo apt -y update + sudo apt -y install autoconf automake make libtool flex bison \ + autopoint gettext help2man texinfo texlive \ + gcc libgmp-dev libncurses-dev \ + libdb-dev libxml2-dev libcjson-dev - - name: Installing VISAM prerequisite + - name: Install VISAM if: ${{ matrix.isam == 'visam' }} run: | - wget http://inglenet.ca/Products/GnuCOBOL/visam-2.2.tar.Z + curl -LO http://inglenet.ca/Products/GnuCOBOL/visam-2.2.tar.Z tar -xvzf visam-2.2.tar.Z cd visam-2.2 - ./configure --prefix=/usr/local/visam-2.2 --enable-vbisamdefault - make - sudo make install - echo "CPATH=/usr/local/visam-2.2/include" >> $GITHUB_ENV - echo "LIBRARY_PATH=/usr/local/visam-2.2/lib" >> $GITHUB_ENV - echo "LD_LIBRARY_PATH=/usr/local/visam-2.2/lib" >> $GITHUB_ENV - - - name: Bootstrap - run: | - ./build_aux/bootstrap install - - # FIXME: With TERM="dumb" `make check` fails with: - # ... - # 571: ACCEPT OMITTED (SCREEN) FAILED (run_accept.at:307) - # ... - # 693: ON EXCEPTION clause of DISPLAY FAILED (run_misc.at:6335) - # 695: LINE/COLUMN 0 exceptions FAILED (run_misc.at:6414) - # 694: EC-SCREEN-LINE-NUMBER and -STARTING-COLUMN FAILED (run_misc.at:6376) - # ... - # Failure cases read: "Error opening terminal: unknown." on - # stderr, and exit with code 1. - # - # Another alternative is passing `--with-curses=no` to the - # configure script, yet distcheck does call configure too... - # - - name: Build environment setup - run: | - mkdir _build - export TERM="vt100" - echo "TERM=$TERM" >> $GITHUB_ENV - echo "INSTALL_PATH=$(pwd)/_install" >> $GITHUB_ENV + ./configure --prefix=/opt/visam --enable-vbisamdefault + make && sudo make install + echo "CPATH=/opt/visam/include" >> $GITHUB_ENV + echo "LIBRARY_PATH=/opt/visam/lib" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=/opt/visam/lib" >> $GITHUB_ENV + + - name: Bootstrap GnuCOBOL + run: ./build_aux/bootstrap install - - name: Configure + - name: Configure GnuCOBOL run: | - cd _build + mkdir _build && cd _build ../configure --with-${{ matrix.isam }} \ --with-indexed=${{ matrix.isam }} \ --enable-cobc-internal-checks \ - --enable-hardening \ - --prefix ${INSTALL_PATH} - echo "VERSION=PACKAGE_VERSION" | cpp -P -imacros config.h | tr -d \" \ - >> $GITHUB_ENV + --enable-hardening + echo "VERSION=PACKAGE_VERSION" | cpp -P -imacros config.h | tr -d \" >> $GITHUB_ENV + + - name: Build GnuCOBOL + run: make -C _build --jobs=$(($(nproc)+1)) - - name: Upload config-${{ matrix.os }}-${{ matrix.isam }}.log + - name: Upload config-${{ matrix.isam }}.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 - if: failure() with: - name: config-${{ matrix.os }}-${{ matrix.isam }}.log + name: config-${{ matrix.isam }}.log path: _build/config.log - - name: Build - run: | - make -C _build --jobs=$(($(nproc)+1)) - # note: distcheck also creates the dist tarball - name: Build distribution archive & run tests run: | - make -C _build distcheck \ - TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" \ - --jobs=$(($(nproc)+1)) || \ - make -C _build/gnucobol-$VERSION/_build/sub/tests check \ + make -C _build distcheck --jobs=$(($(nproc)+1)) \ + TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" || \ + make -C _build/gnucobol-$VERSION/_build/sub/tests check \ TESTSUITEFLAGS="--recheck --verbose" + make -C _build --jobs=$(($(nproc)+1)) dist DIST_TARGETS="dist-gzip distwin-zip" + make -C _build --jobs=$(($(nproc)+1)) distbin DISTBIN_TARGETS="distbin-xz" - - name: Upload testsuite-${{ matrix.os }}-${{ matrix.isam }}.log + - name: Upload testsuite-${{ matrix.isam }}.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 - if: failure() with: - # Assume there's only one directory matching `_build/gnucobol-*`: - name: testsuite-${{ matrix.os }}-${{ matrix.isam }}.log + name: testsuite-${{ matrix.isam }}.log path: _build/gnucobol-${{ env.VERSION }}/_build/sub/tests/testsuite.log - name: Upload dist tarball + if: ${{ matrix.isam != 'visam' }} uses: actions/upload-artifact@v4 with: - name: gnucobol-ci source distribution (${{ matrix.isam }}) - path: _build/gnucobol*.tar* + name: gnucobol-ci source distribution + path: _build/gnucobol*.tar.gz + if-no-files-found: error + retention-days: 0 + + - name: Upload dist tarball (Windows) + if: ${{ matrix.isam != 'visam' }} + uses: actions/upload-artifact@v4 + with: + name: gnucobol-ci windows source distribution + path: _build/gnucobol*.zip + if-no-files-found: error + retention-days: 0 + + - name: Upload test binaries + if: ${{ matrix.isam != 'visam' }} + uses: actions/upload-artifact@v4 + with: + name: gnucobol-ci binary distribution + path: _build/gnucobol*.tar.xz if-no-files-found: error retention-days: 0 @@ -127,88 +122,159 @@ jobs: with: path: _build/tests/cobol85/newcob.val key: newcob-val - save-always: true enableCrossOsArchive: true - - name: NIST85 Test Suite + - name: Run NIST85 testsuite + run: make -C _build test --jobs=$(($(nproc)+1)) + + - name: Upload NIST85 Test Suite results + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: NIST85 results on ${{ matrix.isam }} + path: | + _build/tests/cobol85/summary.* + _build/tests/cobol85/**/*.log + _build/tests/cobol85/**/*.out + _build/tests/cobol85/**/duration.txt + + + minmal_build: + needs: build + runs-on: ubuntu-latest + timeout-minutes: 10 + strategy: + fail-fast: true + + steps: + + - name: Get CI dist tarball + uses: actions/download-artifact@v4 + with: + name: gnucobol-ci source distribution + + - name: Extract CI dist tarball + run: tar -xvf gnucobol*.tar.* --strip-components=1 + + - name: Install packages + run: | + sudo apt -y update + sudo apt -y install make libtool gcc libgmp-dev + sudo apt -y remove flex bison + + - name: Configure GnuCOBOL run: | - make -C _build/tests/cobol85 EXEC85 test \ - --jobs=$(($(nproc)+1)) + mkdir _build && cd _build + ../configure --without-curses --without-db --without-xml2 \ + --without-json --without-iconv --disable-nls \ + --disable-dependency-tracking + + - name: Build GnuCOBOL + run: make -C _build --jobs=$(($(nproc)+1)) + + - name: Upload config-minimal.log + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: config-minimal.log + path: _build/config.log + + - name: Run testsuite + run: | + make -C _build check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" || \ + make -C _build check TESTSUITEFLAGS="--recheck --verbose" + + - name: Upload testsuite-minimal.log + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: testsuite-minimal.log + path: _build/tests/testsuite.log + + - name: Cache newcob.val + uses: actions/cache@v4 + with: + path: _build/tests/cobol85/newcob.val + key: newcob-val + enableCrossOsArchive: true + + - name: Run NIST85 testsuite + run: make -C _build test --jobs=$(($(nproc)+1)) - name: Upload NIST85 Test Suite results + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: - name: NIST85 results on ${{ matrix.os }} (${{ matrix.isam }}) + name: NIST85 results on minimal path: | + _build/tests/cobol85/summary.* _build/tests/cobol85/**/*.log _build/tests/cobol85/**/*.out + _build/tests/cobol85/**/duration.txt coverage: - name: Coverage and Warnings + needs: build runs-on: ubuntu-22.04 + timeout-minutes: 10 steps: - - name: Checkout code - uses: actions/checkout@v4 - # note: less dependencies as we don't generate a dist tarball, one additional for lcov - - name: Install dependencies - run: | - sudo apt-get install automake libtool libdb5.3-dev libxml2-dev \ - libcjson-dev bison flex help2man gettext lcov autopoint + - name: Get CI dist tarball + uses: actions/download-artifact@v4 + with: + name: gnucobol-ci source distribution - - name: Bootstrap - run: | - ./build_aux/bootstrap install + - name: Extract CI dist tarball + run: tar -xvf gnucobol*.tar.* --strip-components=1 + + - name: Setup build environment + run: echo "TERM=vt100" >> $GITHUB_ENV - - name: Build environment setup + - name: Install dependencies run: | - mkdir _build - export TERM="vt100" - echo "TERM=$TERM" >> $GITHUB_ENV + sudo apt -y update + sudo apt -y install lcov make libtool \ + gcc libgmp-dev libncurses-dev \ + libdb-dev libxml2-dev libcjson-dev - # note: w add additional C compiler syntax checks here to not need - # _another_ CI run - # - # TODO: try and pass -pedantic via CPPFLAGS - - name: Configure + # note: add additional C compiler syntax checks here to not need _another_ CI run + - name: Configure GnuCOBOL run: | - cd _build - ../configure --enable-code-coverage \ + mkdir _build && cd _build + ../configure --with-db --with-indexed=db \ + --enable-code-coverage \ CPPFLAGS="-Werror=declaration-after-statement" \ CC="gcc -std=c89" - - name: Upload config-${{ matrix.os }}-${{ matrix.isam }}.log + - name: Build GnuCOBOL + run: make -C _build --jobs=$(($(nproc)+1)) + + - name: Upload config-coverage.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 - if: failure() with: - name: config-${{ matrix.os }}-${{ matrix.isam }}.log + name: config-coverage.log path: _build/config.log - - name: Build - run: | - make -C _build --jobs=$(($(nproc)+1)) - - name: Coverage run: | # make -C _build check-code-coverage # <- (ignores errors) - make -C _build check \ - TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" + make -C _build check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" make -C _build code-coverage-capture \ CODE_COVERAGE_DIRECTORY="$(realpath .)/_build" - - name: Upload testsuite-${{ matrix.os }}-${{ matrix.isam }}.log + - name: Upload testsuite-coverage.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 - if: failure() with: - name: testsuite-${{ matrix.os }}-${{ matrix.isam }}.log + name: testsuite-coverage.log path: _build/tests/testsuite.log - name: Upload coverage report uses: actions/upload-artifact@v4 with: - name: coverage-${{ matrix.os }}-${{ matrix.isam }} + name: coverage path: _build/GnuCOBOL-**-coverage/ - name: Cache newcob.val @@ -216,14 +282,11 @@ jobs: with: path: _build/tests/cobol85/newcob.val key: newcob-val - save-always: true enableCrossOsArchive: true - name: Extended coverage run: | - make -C _build/tests/cobol85 EXEC85 test \ - --jobs=$(($(nproc)+1)) \ - --keep-going + make -C _build test --jobs=$(($(nproc)+1)) --keep-going make -C _build code-coverage-capture \ CODE_COVERAGE_OUTPUT_DIRECTORY=extended-coverage \ CODE_COVERAGE_OUTPUT_FILE=extended-coverage.info \ @@ -232,7 +295,7 @@ jobs: - name: Upload extended coverage report uses: actions/upload-artifact@v4 with: - name: extended-coverage-${{ matrix.os }}-${{ matrix.isam }} + name: extended-coverage path: _build/extended-coverage - name: Upload coverage to codecov @@ -243,3 +306,300 @@ jobs: # Shall fail until we have a working account on codecov.io fail_ci_if_error: false # optional (default = false) verbose: true # optional (default = false) + + + msys_build_test_createdist: + needs: build + runs-on: windows-latest + timeout-minutes: 40 # 30-35 min when building deps, 19-23 min when using cache + + env: + MSYS_ROOT: C:\MinGW + MSYS_BIN: C:\MinGW\msys\1.0\bin + + MSYSTEM: MINGW32 + MSYSPKGS: msys-coreutils msys-patch + + MSYS_URL: https://www.arnoldtrembley.com/MinGW-bkup02.7z + + # Note: MSYS1 cannot connect to https://gmplib.org, so using GNU mirror side instead + GMP_URL: https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz + PDCM_URL: https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.tar.gz + BDB_URL: https://download.oracle.com/berkeley-db/db-6.0.19.NC.tar.gz + BDBP_URL: https://raw.githubusercontent.com/msys2/MINGW-packages/refs/heads/master/mingw-w64-db + XML2_URL: https://github.com/GNOME/libxml2/archive/refs/tags/v2.8.0.tar.gz + CJSON_URL: https://raw.githubusercontent.com/DaveGamble/cJSON/v1.7.18 + + defaults: + run: + shell: cmd + + strategy: + fail-fast: false + matrix: + target: + - debug + - release + + steps: + + - name: Get CI dist tarball + uses: actions/download-artifact@v4 + with: + name: gnucobol-ci source distribution + + - name: Extract CI dist tarball + shell: bash + run: tar -xvf gnucobol*.tar.* --strip-components=1 + + - name: Setup build environment + shell: pwsh + run: | + echo $env:MSYS_BIN >> $env:GITHUB_PATH + echo HOME=$env:GITHUB_WORKSPACE >> $env:GITHUB_ENV + If ("${{ matrix.target }}" -eq "release") { + echo DISTDIR=GnuCOBOL_mingw >> $env:GITHUB_ENV + echo CFGOPT="--with-pkgversion=GnuCOBOL-CI-MSYS" >> $env:GITHUB_ENV + } Else { + echo DISTDIR=GnuCOBOL_mingw_dbg >> $env:GITHUB_ENV + echo CFGOPT="--with-pkgversion=GnuCOBOL-CI-MSYS-Debug --enable-debug --enable-cobc-internal-checks --enable-hardening" >> $env:GITHUB_ENV + } + + + - name: Restore MSYS1 cache + id: restore-msys + uses: actions/cache/restore@v4 + with: + key: cache-msys-${{ matrix.target }} + path: ${{ env.MSYS_ROOT }} + + - name: Install MSYS1 + if: steps.restore-msys.outputs.cache-hit != 'true' + run: | + curl -L %MSYS_URL% -o msys.7z + 7z x msys.7z -o%MSYS_ROOT% + + - name: Install MSYS1 packages + if: steps.restore-msys.outputs.cache-hit != 'true' + run: bash -lc "mingw-get install %MSYSPKGS%" + + - name: Cleanup MSYS1 env + if: steps.restore-msys.outputs.cache-hit != 'true' + run: | + rmdir /Q /S %MSYS_ROOT%\docs + rmdir /Q /S %MSYS_ROOT%\var + del /Q %MSYS_ROOT%\bin\gdb.exe + + - name: Save MSYS1 cache + if: steps.restore-msys.outputs.cache-hit != 'true' + uses: actions/cache/save@v4 + with: + key: cache-msys-${{ matrix.target }} + path: ${{ env.MSYS_ROOT }} + + + - name: Restore GMP cache + id: restore-gmp + uses: actions/cache/restore@v4 + with: + key: cache-msys-gmp-${{ matrix.target }} + path: gmp + + - name: Build GMP + if: steps.restore-gmp.outputs.cache-hit != 'true' + run: | + curl -L %GMP_URL% -o gmp.tar.xz + mkdir gmp && tar -xvf gmp.tar.xz -C gmp --strip-components=1 + bash -lc "cd gmp && ./configure --prefix=/mingw --enable-fat --enable-shared --disable-static ABI=32 CFLAGS=\"-Wno-attributes -Wno-ignored-attributes\"" + bash -lc "make -C gmp --jobs=$(($(nproc)+1))" + + - name: Install GMP + run: bash -lc "make -C gmp install" + + - name: Save GMP cache + if: steps.restore-gmp.outputs.cache-hit != 'true' + uses: actions/cache/save@v4 + with: + key: cache-msys-gmp-${{ matrix.target }} + path: gmp + + + - name: Restore PDCursesMod cache + id: restore-pdcm + uses: actions/cache/restore@v4 + with: + key: cache-msys-pdcm-${{ matrix.target }} + path: pdcm + + - name: Build PDCurses + if: steps.restore-pdcm.outputs.cache-hit != 'true' + run: | + curl -L %PDCM_URL% -o pdcm.tar.gz + mkdir pdcm && tar -xvf pdcm.tar.gz -C pdcm --strip-components=1 + bash -lc "make -C pdcm/wincon --jobs=$(($(nproc)+1)) INFOEX=N CHTYPE_64=Y DEBUG=Y DLL=Y DLLNAME=libpdcurses LIBNAME=libpdcurses.dll" + bash -lc "make -C pdcm/wingui --jobs=$(($(nproc)+1)) CHTYPE_64=Y DEBUG=Y DLL=Y DLLNAME=libpdcurses LIBNAME=libpdcurses.dll" + bash -lc "make -C pdcm/vt --jobs=$(($(nproc)+1)) CHTYPE_64=Y DEBUG=Y DLL=Y DLLNAME=libpdcurses LIBNAME=libpdcurses.dll CFLAGS=\"-Wall -Wextra -pedantic -g -DPDCDEBUG -fPIC -DPDC_DLL_BUILD\"" + echo #define CHTYPE_64 > pdcm\pdcurses.h + echo #define PDC_DLL_BUILD >> pdcm\pdcurses.h + echo #include "pdcurses/curses.h" >> pdcm\pdcurses.h + + - name: Install PDCursesMod + run: | + set HOME=%HOME%\pdcm + bash -lc "install wincon/libpdcurses.dll.a /mingw/lib/" + bash -lc "install wincon/libpdcurses.dll /mingw/bin/" + rem The following three do not seem necessary (no failure if commented out) + bash -lc "install wincon/libpdcurses.dll /mingw/bin/libpdcurses-wincon.dll" + bash -lc "install wingui/libpdcurses.dll /mingw/bin/libpdcurses-wingui.dll" + bash -lc "install vt/libpdcurses.dll /mingw/bin/libpdcurses-vt.dll" + bash -lc "install -d /mingw/include/pdcurses" + bash -lc "install -m 0644 curses.h panel.h term.h /mingw/include/pdcurses/" + bash -lc "install -m 0644 pdcurses.h /mingw/include/" + + - name: Save PDCursesMod cache + if: steps.restore-pdcm.outputs.cache-hit != 'true' + uses: actions/cache/save@v4 + with: + key: cache-msys-pdcm-${{ matrix.target }} + path: pdcm + + + - name: Restore BDB cache + id: restore-bdb + uses: actions/cache/restore@v4 + with: + key: cache-msys-bdb-${{ matrix.target }} + path: bdb + + - name: Build BDB + if: steps.restore-bdb.outputs.cache-hit != 'true' + run: | + curl -L %BDB_URL% -o bdb.tar.gz + curl -L %BDBP_URL%/0001-db-tls-m4-fix-pthread.patch -o db-tls-m4-fix-pthread.patch + curl -L %BDBP_URL%/mingw.patch -o mingw.patch + curl -L %BDBP_URL%/clang_cxx_11.patch -o cx11.patch + mkdir bdb && tar -xvf bdb.tar.gz -C bdb --strip-components=1 + sed -i 's/_tcsclen/_mbslen/' bdb\src\os_windows\os_stat.c + bash -lc "patch -d bdb -p1 -i ../db-tls-m4-fix-pthread.patch" + bash -lc "patch -d bdb -p1 -i ../mingw.patch" + bash -lc "patch -d bdb -p1 -i ../cx11.patch" + bash -lc "cd bdb/build_unix && ../dist/configure --prefix=/mingw --enable-mingw --enable-debug --disable-static --disable-replication --disable-tcl --without-cryptography LIBCSO_LIBS=-lwsock32" + bash -lc "make -C bdb/build_unix --jobs=$(($(nproc)+1))" + + - name: Install BDB + run: bash -lc "make -C bdb/build_unix install" + + - name: Save BDB cache + if: steps.restore-bdb.outputs.cache-hit != 'true' + uses: actions/cache/save@v4 + with: + key: cache-msys-bdb-${{ matrix.target }} + path: bdb + + + - name: Restore LibXML2 cache + id: restore-xml2 + uses: actions/cache/restore@v4 + with: + key: cache-msys-xml2-${{ matrix.target }} + path: libxml2 + + - name: Build LibXML2 + if: steps.restore-xml2.outputs.cache-hit != 'true' + run: | + curl -L %XML2_URL% -o libxml2.tar.gz + mkdir libxml2 && tar -xvf libxml2.tar.gz -C libxml2 --strip-components=1 + bash -lc "cd libxml2 && ./autogen.sh && ./configure --prefix=/mingw --enable-debug" + bash -lc "make -C libxml2 --jobs=$(($(nproc)+1))" + + - name: Install LibXML2 + run: bash -lc "make -C libxml2 install" + + - name: Save LibXML2 cache + if: steps.restore-xml2.outputs.cache-hit != 'true' + uses: actions/cache/save@v4 + with: + key: cache-msys-xml2-${{ matrix.target }} + path: libxml2 + + + - name: Download cJSON + run: curl -LO %CJSON_URL%/cJSON.{c,h} --output-dir libcob + + + - name: Configure GnuCOBOL + run: | + mkdir _build + bash -lc "cd _build && ../configure --with-db --with-indexed=db --with-xml2 --with-json=local --with-curses=pdcurses --prefix=/mingw %CFGOPT% CPPFLAGS=-I../libcob LDFLAGS=-lintl" + rem CPPFLAGS to be dropped after merging the adjustment in configure.ac + + - name: Build GnuCOBOL + run: | + bash -lc "make -C _build --jobs=$(($(nproc)+1)) CPATH=$(pwd)" + rem Note: the extra CPATH above is only required in debug builds + rem (otherwise gcc invoked from cobc does not find libcob.h [pre-inst-env]), for some reason... + + - name: Upload config-msys-${{ matrix.target }}.log + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: config-msys-${{ matrix.target }}.log + path: _build/config.log + + - name: Cache newcob.val + uses: actions/cache@v4 + with: + path: _build/tests/cobol85/newcob.val + key: newcob-val + enableCrossOsArchive: true + + - name: Run NIST85 testsuite + # if we ever need to disable something in the tests: skip like here IF106A + # and later expect a failure + # perl -pi -e 's/^# OBNC1M/\$skip{IF106A} = 1; # OBNC1M/' tests/cobol85/report.pl + # bash -lc "make -C _build test --jobs=$(($(nproc)+1)) CPATH=$(pwd) || echo \"WARNING: NIST85 did not pass!\"" + run: | + bash -lc "make -C _build test --jobs=$(($(nproc)+1)) CPATH=$(pwd)" + rem Note: the extra CPATH above is only required in debug builds + rem (otherwise gcc invoked from cobc does not find libcob.h [atlocal]), for some reason... + + - name: Upload NIST85 Test Suite results + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: NIST85 results on msys-${{ matrix.target }} + path: | + _build/tests/cobol85/summary.* + _build/tests/cobol85/**/*.log + _build/tests/cobol85/**/*.out + _build/tests/cobol85/**/duration.txt + + - name: Adjust testsuite + run: | + cd tests\testsuite.src + sed -i '/AT_SETUP(\[temporary path invalid\])/a AT_SKIP_IF(\[true\])' used_binaries.at + + - name: Run testsuite + continue-on-error: true + run: | + rem to work around regular hangs we run NIST first, then the internal + rem and the later only with 2 jobs -> --jobs does not seem to have any effect in this env + bash -lc "make -C _build check TESTSUITEFLAGS=\"--jobs=2\" CPATH=$(pwd)" + rem Note: the extra CPATH above is only required in debug builds + rem (otherwise gcc invoked from cobc does not find libcob.h [atlocal]), for some reason... + + - name: Upload testsuite-msys-${{ matrix.target }}.log + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: testsuite-msys-${{ matrix.target }}.log + path: _build/tests/testsuite.log + + - name: Package GnuCOBOL MinGW nightly + run: bash -lc "make -C _build distmingw" + + - name: Upload GnuCOBOL_mingw-${{ matrix.target }} + uses: actions/upload-artifact@v4 + with: + name: GnuCOBOL_mingw-${{ matrix.target }} + path: _build/${{ env.DISTDIR }} diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml index 26e5dcf0..554ff071 100644 --- a/.github/workflows/windows-msvc.yml +++ b/.github/workflows/windows-msvc.yml @@ -1,4 +1,4 @@ -name: Windows MSVC (build only) +name: Windows MSVC Workflow on: pull_request: @@ -30,13 +30,11 @@ defaults: jobs: build: + runs-on: windows-latest + timeout-minutes: ${{ matrix.target == 'Debug' && 40 || 25 }} strategy: fail-fast: false matrix: - os: - - windows-latest - isam: - - db # Purely informative arch: - x86 - x64 @@ -44,9 +42,6 @@ jobs: - Debug - Release - runs-on: ${{ matrix.os }} - timeout-minutes: 45 - steps: - name: Set git user @@ -57,10 +52,9 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Setup environment + - name: Setup build environment shell: pwsh run: | - echo GITHUB_WORKSPACE=$env:GITHUB_WORKSPACE >> $env:GITHUB_ENV If ("${{ matrix.arch }}" -eq "x86") { echo VCVARS=$env:VCVARS32 >> $env:GITHUB_ENV echo VCPKGS=$env:VCPKGS32 >> $env:GITHUB_ENV @@ -81,24 +75,20 @@ jobs: ${{ env.VCPKG_ROOT }}/packages - name: Bootstrap VCPKG - if: steps.restore-vcpkg.outputs.cache-hit != 'true' run: | - cd /d %VCPKG_ROOT% - vcpkg update + cd /d "%VCPKG_ROOT%" git pull cmd /C .\bootstrap-vcpkg.bat -disableMetrics + vcpkg update - name: Integrate VCPKG - run: | - vcpkg integrate install + run: vcpkg integrate install - name: Install VCPKG packages if: steps.restore-vcpkg.outputs.cache-hit != 'true' - run: | - vcpkg install %VCPKGS% + run: vcpkg install %VCPKGS% - name: Save VCPKG cache - if: steps.restore-vcpkg.outputs.cache-hit != 'true' uses: actions/cache/save@v4 with: key: cache-vcpkg-${{ matrix.arch }}-${{ matrix.target }} @@ -111,7 +101,7 @@ jobs: id: restore-flexbison with: key: cache-flexbison-${{ matrix.arch }}-${{ matrix.target }} - path: ${{ env.GITHUB_WORKSPACE }}/flexbison + path: flexbison - name: Install WinFlexBison if: steps.restore-flexbison.outputs.cache-hit != 'true' @@ -125,42 +115,42 @@ jobs: uses: actions/cache/save@v4 with: key: cache-flexbison-${{ matrix.arch }}-${{ matrix.target }} - path: ${{ env.GITHUB_WORKSPACE }}/flexbison + path: flexbison - name: Configure GnuCOBOL shell: pwsh run: | cd build_windows - Get-Content -Path 'config.h.in' | ForEach-Object { $_ ` + (('#define COB_MAIN_DIR "' + $env:GITHUB_WORKSPACE + '"') -replace '\\', '\\') + "`r`n" + ` + ((Get-Content -Path 'config.h.in' | ForEach-Object { $_ ` -replace '(#define\s+CONFIGURED_ISAM)\s.+$', '$1 BDB' ` -replace '(#define\s+CONFIGURED_CURSES)\s.+$', '$1 PDCURSES' ` -replace '(#define\s+CONFIGURED_XML)\s.+$', '$1 XML2' ` -replace '(#define\s+CONFIGURED_JSON)\s.+$', '$1 CJSON_CJSON' ` - } | Set-Content -Path 'config.h' + -replace '"\(" PACKAGE_NAME "\) "', '"(GnuCOBOL-CI ${{ matrix.target }}) "' ` + }) -join "`r`n") | Set-Content -Path 'config.h' & .\maketarstamp.ps1 > tarstamp.h - name: Generate parser run: | - cd build_windows set PATH=%GITHUB_WORKSPACE%\flexbison;%PATH% - cmd /C .\makebisonflex.cmd atlocal autom4te --lang=autotest -I ./testsuite.src ./testsuite.at -o ./testsuite + - name: Build gcdiff + run: | + set PATH="%GITHUB_WORKSPACE%\build_windows\%ARCHDIR%\${{ matrix.target }}";%PATH% + call "%VCVARS%" + cd bin + cobc -x gcdiff.c + - name: Run testsuite continue-on-error: true run: | - cd tests - set PATH="%GITHUB_WORKSPACE%\build_windows\%ARCHDIR%\${{ matrix.target }}";"%GITHUB_WORKSPACE%\bin";%PATH% + rem Needed for the testsuite to find gcdiff + set PATH="%GITHUB_WORKSPACE%\bin";%PATH% + rem Needed for now because the paths compiled in have trailing slashes - cl.exe does not like that set COB_CFLAGS=/I"%GITHUB_WORKSPACE%" /I"%GITHUB_WORKSPACE%\build_windows" + rem Needed so mpir.h can be found set CL=/I "%VCPKG_ROOT%\installed\${{ matrix.arch }}-windows\include" call "%VCVARS%" - pushd ..\bin - cobc -x gcdiff.c - popd + cd tests set MSYS2_PATH_TYPE=inherit - C:\shells\msys2bash.cmd -c "./testsuite || ./testsuite --recheck --verbose" + C:\shells\msys2bash.cmd -c "./testsuite --jobs=4 || ./testsuite --recheck --verbose" - name: Upload testsuite-${{ matrix.arch }}-${{ matrix.target }}.log + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: name: testsuite-${{ matrix.arch }}-${{ matrix.target }}.log - path: ${{ env.GITHUB_WORKSPACE }}/tests/testsuite.log - - # - name: Package GnuCOBOL - # run: | - # cd build_windows - # set PATH="%GITHUB_WORKSPACE%\build_windows\%ARCHDIR%\${{ matrix.target }}";"%GITHUB_WORKSPACE%\bin";%PATH% - # set COB_CFLAGS=/I"%GITHUB_WORKSPACE%" /I"%GITHUB_WORKSPACE%\build_windows" - # set CL=/I "%VCPKG_ROOT%\installed\${{ matrix.arch }}-windows\include" - # call "%VCVARS%" - # cmd /C .\makedist.cmd > $env:GITHUB_ENV - echo HOME=$env:GITHUB_WORKSPACE >> $env:GITHUB_ENV - echo PATH="$env:MSYS_BIN;$env:PATH" >> $env:GITHUB_ENV - If ("${{ matrix.target }}" -eq "release") { - echo DISTDIR=GnuCOBOL_mingw >> $env:GITHUB_ENV - echo CFGOPT= >> $env:GITHUB_ENV - } Else { - echo DISTDIR=GnuCOBOL_mingw_dbg >> $env:GITHUB_ENV - echo CFGOPT="--enable-debug --enable-cobc-internal-checks --enable-hardening" >> $env:GITHUB_ENV - } - - - name: Restore MSYS1 cache - id: restore-msys - uses: actions/cache/restore@v4 - with: - key: cache-msys-${{ matrix.target }} - path: ${{ env.MSYS_ROOT }} - - - name: Install MSYS1 - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - curl -O https://www.arnoldtrembley.com/MinGW-bkup02.7z - 7z x MinGW-bkup02.7z -o%MSYS_ROOT%\ - - - name: Install MSYS1 packages - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - bash -lc "mingw-get install %MSYSPKGS%" - - - name: Install Bison 3.0 - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - curl -L https://mirror.ibcp.fr/pub/gnu/bison/%MINGW_BISON_VERS%.tar.xz -o %MINGW_BISON_VERS%.tar.xz - tar -xvf %MINGW_BISON_VERS%.tar.xz - bash -lc "cd %MINGW_BISON_VERS% && ./configure --prefix=/mingw && make" - bash -lc "cd %MINGW_BISON_VERS% && make install" - - # Note: actually unavailable, so skip (works with the GMP already provided) - # - name: Install GMP - # if: steps.restore-msys.outputs.cache-hit != 'true' - # run: | - # curl -L https://gmplib.org/download/gmp/%MINGW_GMP_VERS%.tar.xz -o %MINGW_GMP_VERS%.tar.xz - # tar -xvf %MINGW_GMP_VERS%.tar.xz - # bash -lc "cd %MINGW_GMP_VERS% && ./configure --prefix=/mingw --enable-fat --enable-shared --disable-static CFLAGS=\"-Wno-attributes -Wno-ignored-attributes\" ABI=32 && make" - # bash -lc "cd %MINGW_GMP_VERS% && make install" - - - name: Install BDB - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - curl -L https://download.oracle.com/berkeley-db/%MINGW_BDB_VERS%.tar.gz -o %MINGW_BDB_VERS%.tar.gz - tar -xvf %MINGW_BDB_VERS%.tar.gz - sed -i 's/_tcsclen/strlen/' %MINGW_BDB_VERS%\src\os_windows\os_stat.c - bash -lc "cd %MINGW_BDB_VERS%/build_unix && ../dist/configure --prefix=/mingw --enable-mingw --enable-debug --disable-static --disable-replication --disable-tcl LIBCSO_LIBS=-lwsock32 && make || make" - bash -lc "cd %MINGW_BDB_VERS%/build_unix && make install" - - - name: Install PDCurses - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - curl -L https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v%MINGW_PDCM_VERS%.tar.gz -o "PDCursesMod-%MINGW_PDCM_VERS%.tar.xz" - tar -xvf PDCursesMod-%MINGW_PDCM_VERS%.tar.xz - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS%\wincon && make INFOEX=N CHTYPE_64=Y DEBUG=Y DLL=Y DLLNAME=libpdcurses LIBNAME=libpdcurses.dll" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS%\wingui && make CHTYPE_64=Y DEBUG=Y DLL=Y DLLNAME=libpdcurses LIBNAME=libpdcurses.dll" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS%\vt && make CHTYPE_64=Y DEBUG=Y DLL=Y DLLNAME=libpdcurses LIBNAME=libpdcurses.dll CFLAGS=\"-Wall -Wextra -pedantic -g -DPDCDEBUG -fPIC -DPDC_DLL_BUILD\"" - echo #define CHTYPE_64 > PDCursesMod-%MINGW_PDCM_VERS%\pdcurses.h - echo #define PDC_DLL_BUILD >> PDCursesMod-%MINGW_PDCM_VERS%\pdcurses.h - echo #include "pdcurses/curses.h" >> PDCursesMod-%MINGW_PDCM_VERS%\pdcurses.h - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install wincon/libpdcurses.dll.a /mingw/lib/" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install wincon/libpdcurses.dll /mingw/bin/" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install wincon/libpdcurses.dll /mingw/bin/libpdcurses-wincon.dll" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install wingui/libpdcurses.dll /mingw/bin/libpdcurses-wingui.dll" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install vt/libpdcurses.dll /mingw/bin/libpdcurses-vt.dll" - bash -lc "install -d /mingw/include/pdcurses" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install -m 0644 curses.h panel.h term.h /mingw/include/pdcurses/" - bash -lc "cd PDCursesMod-%MINGW_PDCM_VERS% && install -m 0644 pdcurses.h /mingw/include/" - - - name: Install LibXML2 - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - curl -L https://github.com/GNOME/libxml2/archive/refs/tags/v%MINGW_XML2_VERS%.tar.gz -o libxml2-%MINGW_XML2_VERS%.tar.xz - tar -xvf libxml2-%MINGW_XML2_VERS%.tar.xz - bash -lc "cd libxml2-%MINGW_XML2_VERS% && ./autogen.sh" - bash -lc "cd libxml2-%MINGW_XML2_VERS% && ./configure --prefix=/mingw && make" - bash -lc "cd libxml2-%MINGW_XML2_VERS% && make install" - - - name: Cleanup MSYS1 env - if: steps.restore-msys.outputs.cache-hit != 'true' - run: | - rmdir /Q /S %MSYS_ROOT%\docs - rmdir /Q /S %MSYS_ROOT%\var - del /Q %MSYS_ROOT%\bin\gdb.exe - - - name: Save MSYS1 cache - if: steps.restore-msys.outputs.cache-hit != 'true' - uses: actions/cache/save@v4 - with: - key: cache-msys-${{ matrix.target }} - path: ${{ env.MSYS_ROOT }} - - - name: Download CJSON sources - run: | - curl -L https://github.com/DaveGamble/cJSON/archive/refs/tags/v%MINGW_CJSON_VERS%.tar.gz -o cjson-%MINGW_CJSON_VERS%.tar.xz - tar -xvf cjson-%MINGW_CJSON_VERS%.tar.xz - copy cjson-%MINGW_CJSON_VERS%\cJSON.* .\libcob - - - name: Bootstrap GnuCOBOL - run: | - sed -i 's/AM_PROG_AR/m4_ifdef\(\[AM_PROG_AR\], \[AM_PROG_AR\]\)/g' .\configure.ac - sed -i 's/po extras doc tests/po extras tests/g' .\Makefile.am - bash -lc "./autogen.sh" - - - name: Configure GnuCOBOL - run: | - mkdir _build - sed -i 'N;s/else/else :;/g' .\configure - sed -i 's/\} else \:;/} else/g' .\configure - sed -i 's/#else \:;/#else/g' .\configure - bash -lc "cd _build && CFLAGS=\"-I ../libcob\" ../configure %CFGOPT% --with-db --with-indexed=db --prefix=/opt/cobol/gnucobol" - - - name: Upload config-${{ matrix.target }}.log - uses: actions/upload-artifact@v4 - if: failure() - with: - name: config-${{ matrix.target }}.log - path: ${{ env.GITHUB_WORKSPACE }}/_build/config.log - - - name: Build GnuCOBOL - run: | - bash -lc "cd _build && CPATH=$(pwd)/.. make --jobs=$(($(nproc)+1))" - -# Note: the extra CPATH above is only required in debug builds, for some reason... - - - name: Install GnuCOBOL - run: | - bash -lc "cd _build && make install" - bash -lc "cd _build && find /opt/cobol > install.log" - - - name: Upload install-${{ matrix.target }}.log - uses: actions/upload-artifact@v4 - with: - name: install-${{ matrix.target }}.log - path: ${{ env.GITHUB_WORKSPACE }}/_build/install.log - - - name: Run testsuite - continue-on-error: true - run: | - sed -i '/AT_SETUP(\[temporary path invalid\])/a AT_SKIP_IF(\[true\])' tests/testsuite.src/used_binaries.at - bash -lc "cd _build/tests && CPATH=/opt/cobol/gnucobol/include make check TESTSUITEFLAGS=\"--jobs=$(($(nproc)+1))\"" - -# Note: the extra CPATH above is only required in debug builds, for some reason... - -# The NIST testsuite hangs forever in IF -# bash -lc "CPATH=/opt/cobol/gnucobol/include make test" - - - name: Upload testsuite-${{ matrix.target }}.log - uses: actions/upload-artifact@v4 - with: - name: testsuite-${{ matrix.target }}.log - path: ${{ env.GITHUB_WORKSPACE }}/_build/tests/testsuite.log - - - name: Package GnuCOBOL - run: | - bash -lc "cd _build && make distmingw" - - - name: Upload GnuCOBOL_mingw-${{ matrix.target }} - uses: actions/upload-artifact@v4 - with: - name: GnuCOBOL_mingw-${{ matrix.target }} - path: ${{ env.GITHUB_WORKSPACE }}/_build/${{ env.DISTDIR }} diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml index 46688068..543fbb38 100644 --- a/.github/workflows/windows-msys2.yml +++ b/.github/workflows/windows-msys2.yml @@ -1,4 +1,4 @@ -name: Windows MSYS2 (build only) +name: Windows MSYS2 Workflow on: pull_request: @@ -8,19 +8,9 @@ on: workflow_dispatch: jobs: - build: - strategy: - fail-fast: false - matrix: - include: - - { os: windows-latest, isam: db, target: release, sys: mingw64, env: x86_64 } - - { os: windows-latest, isam: db, target: debug, sys: mingw64, env: x86_64 } - - { os: windows-latest, isam: db, target: debug, sys: ucrt64, env: ucrt-x86_64 } - - { os: windows-latest, isam: db, target: debug, sys: clang64, env: clang-x86_64 } - # - { target: debug, sys: mingw32, env: i686 } - - runs-on: ${{ matrix.os }} - timeout-minutes: 45 + prepare: + runs-on: windows-latest + timeout-minutes: 10 steps: @@ -32,98 +22,179 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Setup environment + - name: Install packages + uses: msys2/setup-msys2@v2 + with: + update: true + msystem: ucrt64 + install: autoconf automake make libtool flex bison + gettext gettext-devel help2man texinfo texinfo-tex + mingw-w64-ucrt-x86_64-texlive-core + mingw-w64-ucrt-x86_64-cc + mingw-w64-ucrt-x86_64-gmp + + - name: Bootstrap GnuCOBOL + shell: msys2 {0} + run: ./build_aux/bootstrap install + + - name: Configure GnuCOBOL + shell: msys2 {0} + run: | + mkdir _build && cd _build + ../configure --without-curses --without-db --without-xml2 --without-json + + - name: Build GnuCOBOL source distribution + shell: msys2 {0} + run: | + make -C _build --jobs=$(($(nproc)+1)) + make -C _build --jobs=$(($(nproc)+1)) dist + + - name: Upload config-dist.log + uses: actions/upload-artifact@v4 + if: ${{ !cancelled() }} + with: + name: config-dist.log + path: _build/config.log + + - name: Upload dist tarball + uses: actions/upload-artifact@v4 + with: + name: gnucobol-ci source distribution msys2 + path: _build/gnucobol*.tar.gz + if-no-files-found: error + retention-days: 0 + + build: + needs: prepare + runs-on: windows-latest + timeout-minutes: ${{ matrix.sys == 'clang64' && 35 || 20 }} + strategy: # usually 13-15 min, except clang, which takes ~30 min + fail-fast: false + matrix: + include: + - { target: release, sys: mingw64, env: x86_64 } + - { target: debug, sys: mingw64, env: x86_64 } + - { target: release, sys: ucrt64, env: ucrt-x86_64 } + - { target: release, sys: clang64, env: clang-x86_64 } + - { target: release, sys: mingw32, env: i686 } + + steps: + + - name: Get CI dist tarball + uses: actions/download-artifact@v4 + with: + name: gnucobol-ci source distribution msys2 + + - name: Extract CI dist tarball + shell: bash + run: tar -xvf gnucobol*.tar.* --strip-components=1 + + - name: Setup build environment + shell: pwsh run: | - echo GITHUB_WORKSPACE=$env:GITHUB_WORKSPACE >> $env:GITHUB_ENV If ("${{ matrix.target }}" -eq "release") { echo DISTDIR=GnuCOBOL_mingw >> $env:GITHUB_ENV - echo CFGOPT= >> $env:GITHUB_ENV + echo CFGOPT="--with-pkgversion=GnuCOBOL-CI-MSYS2" >> $env:GITHUB_ENV } Else { echo DISTDIR=GnuCOBOL_mingw_dbg >> $env:GITHUB_ENV - echo CFGOPT="--enable-debug --enable-cobc-internal-checks --enable-hardening" >> $env:GITHUB_ENV + echo CFGOPT="--with-pkgversion=GnuCOBOL-CI-MSYS2-Debug --enable-debug --enable-cobc-internal-checks --enable-hardening" >> $env:GITHUB_ENV + } + # Common options (dependencies) + echo CFGOPT="$env:CFGOPT --with-math=gmp --with-curses=ncursesw --with-xml2 --with-json=json-c" >> $env:GITHUB_ENV + # Conditional inclusion of --with-db (MSYS2 does not provide 32bit builds for BDB any more) + If ("${{ matrix.sys }}" -ne "mingw32") { + echo CFGOPT="$env:CFGOPT --with-db --with-indexed=db" >> $env:GITHUB_ENV + } Else { + echo CFGOPT="$env:CFGOPT --without-db" >> $env:GITHUB_ENV } - name: Install packages uses: msys2/setup-msys2@v2 with: update: true - msystem: ${{matrix.sys}} - install: autoconf automake libtool make flex bison help2man texinfo - mingw-w64-${{matrix.env}}-cc - mingw-w64-${{matrix.env}}-gmp gmp-devel - mingw-w64-${{matrix.env}}-gettext-runtime gettext-devel - mingw-w64-${{matrix.env}}-ncurses - mingw-w64-${{matrix.env}}-libxml2 - mingw-w64-${{matrix.env}}-cjson - mingw-w64-${{matrix.env}}-db libdb-devel + msystem: ${{ matrix.sys }} + install: autoconf automake make libtool flex bison + mingw-w64-${{ matrix.env }}-cc + mingw-w64-${{ matrix.env }}-gmp + mingw-w64-${{ matrix.env }}-ncurses + mingw-w64-${{ matrix.env }}-libxml2 + mingw-w64-${{ matrix.env }}-json-c + + - name: Install BDB package + if: ${{ matrix.sys != 'mingw32' }} # MSYS2 does not provide 32bit builds for it any more + uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.sys }} + install: mingw-w64-${{ matrix.env }}-db - - name: Bootstrap GnuCOBOL - shell: msys2 {0} - run: | - ./build_aux/bootstrap install +# libdb-devel - name: Configure GnuCOBOL shell: msys2 {0} run: | - mkdir _build - cd _build - export CFLAGS="-Wno-unused-command-line-argument $CFLAGS" - ../configure $CFGOPT --with-db --with-indexed=db --prefix=/opt/cobol/gnucobol - - - name: Upload config-${{matrix.sys}}-${{matrix.target}}.log - uses: actions/upload-artifact@v4 - if: failure() - with: - name: config-${{matrix.sys}}-${{matrix.target}}.log - path: ${{ env.GITHUB_WORKSPACE }}/_build/config.log + mkdir _build && cd _build + ../configure $CFGOPT CFLAGS="-Wno-parentheses-equality $CFLAGS" - name: Build GnuCOBOL shell: msys2 {0} - run: | - make -C _build --jobs=$(($(nproc)+1)) + run: make -C _build --jobs=$(($(nproc)+1)) + + - name: Upload config-${{ matrix.sys }}-${{ matrix.target }}.log + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: config-${{ matrix.sys }}-${{ matrix.target }}.log + path: _build/config.log - name: Cache newcob.val uses: actions/cache@v4 with: path: _build/tests/cobol85/newcob.val key: newcob-val - save-always: true enableCrossOsArchive: true - - name: Run testuite - continue-on-error: true + - name: Run NIST85 testsuite shell: msys2 {0} - run: | - sed '/AT_SETUP(\[temporary path invalid\])/a \ - AT_SKIP_IF(\[true\])' -i tests/testsuite.src/used_binaries.at - sed '/AT_SETUP(\[ACCEPT OMITTED (SCREEN)\])/a \ - AT_SKIP_IF(\[true\])' -i tests/testsuite.src/run_accept.at - make -C _build/tests checkall \ - --jobs=$(($(nproc)+1)) \ - TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" || \ - make -C _build/tests check \ - TESTSUITEFLAGS="--recheck --verbose" - - - name: Upload testsuite-${{matrix.sys}}-${{matrix.target}}.log + run: make -C _build test --jobs=$(($(nproc)+1)) + + - name: Upload NIST85 Test Suite results + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: - name: testsuite-${{matrix.sys}}-${{matrix.target}}.log - path: ${{ env.GITHUB_WORKSPACE }}/_build/tests/testsuite.log + name: NIST85 results on ${{ matrix.sys }}-${{ matrix.target }} + path: | + _build/tests/cobol85/summary.* + _build/tests/cobol85/**/*.log + _build/tests/cobol85/**/*.out + _build/tests/cobol85/**/duration.txt + + - name: Adjust testsuite + run: | + cd tests\testsuite.src + sed -i '/AT_SETUP(\[temporary path invalid\])/a AT_SKIP_IF(\[true\])' used_binaries.at - - name: Package GnuCOBOL + - name: Run testsuite + continue-on-error: true shell: msys2 {0} run: | - make -C _build distmingw + make -C _build check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" || \ + make -C _build check TESTSUITEFLAGS="--recheck --verbose" - - name: Tar GnuCOBOL_mingw-${{matrix.sys}}-${{matrix.target}} + - name: Upload testsuite-${{ matrix.sys }}-${{ matrix.target }}.log + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: testsuite-${{ matrix.sys }}-${{ matrix.target }}.log + path: _build/tests/testsuite.log + + - name: Package GnuCOBOL MinGW nightly shell: msys2 {0} run: | - cd _build - tar -cvf ../GnuCOBOL_mingw-${{matrix.sys}}-${{matrix.target}}.tar \ - "${{ env.DISTDIR }}" + make -C _build distmingw + tar -cvf GnuCOBOL_msys2-${{ matrix.sys }}-${{ matrix.target }}.tar _build/$DISTDIR - - name: Upload GnuCOBOL_mingw-${{matrix.sys}}-${{matrix.target}}.tar + - name: Upload GnuCOBOL_msys2-${{ matrix.sys }}-${{ matrix.target }}.tar uses: actions/upload-artifact@v4 with: - name: GnuCOBOL_mingw-${{matrix.sys}}-${{matrix.target}}.tar - path: GnuCOBOL_mingw-${{matrix.sys}}-${{matrix.target}}.tar + name: GnuCOBOL_msys2-${{ matrix.sys }}-${{ matrix.target }}.tar + path: GnuCOBOL_msys2-${{ matrix.sys }}-${{ matrix.target }}.tar