Improved CI for Java interoperability

OCamlPro · Aug 21, 2024 · 894aa73 · 894aa73
1 parent 4edf4a4
commit 894aa73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/.github/workflows/ubuntu-java.yml b/.github/workflows/ubuntu-java.yml
@@ -67,9 +67,11 @@ jobs:
           ../configure --enable-cobc-internal-checks \
                        --enable-hardening \
                        --prefix ${INSTALL_PATH} \
+                       --disable-nls \
                        --without-indexed \
                        --without-json \
                        --without-xml2 \
+                       --without-curses \
                        --with-java
           echo "VERSION=PACKAGE_VERSION" | cpp -P -imacros config.h | tr -d \" >> $GITHUB_ENV
 
@@ -88,12 +90,15 @@ jobs:
         run: |
           make -C _build distcheck                                    \
                          TESTSUITEFLAGS="--jobs=$(($(nproc)+1))"      \
-                         DISTCHECK_CONFIGURE_FLAGS="--without-indexed \
+                         DISTCHECK_CONFIGURE_FLAGS="--disable-nls     \
+                                                    --without-indexed \
                                                     --without-json    \
                                                     --without-xml2    \
+                                                    --without-curses  \
                                                     --with-java" ||   \
-          make -C _build check                                        \
+          make -C _build/gnucobol-$VERSION/_build/sub/tests check     \
                          TESTSUITEFLAGS="--recheck --verbose"
+          ls -R _build/gnucobol-$VERSION # <- temporary
 
       # Note: NIST tests are not performed by this CI workflow: they
       # do not involve any Java interoperability feature.

diff --git a/.github/workflows/windows-java.yml b/.github/workflows/windows-java.yml
@@ -32,8 +32,6 @@ jobs:
                    gmp-devel gettext-devel
                    mingw-w64-${{matrix.env}}-cc
                    mingw-w64-${{matrix.env}}-gmp
-                   mingw-w64-${{matrix.env}}-gettext-runtime
-                   mingw-w64-${{matrix.env}}-ncurses
 
       - name: Set git user
         run: |
@@ -45,15 +43,9 @@ jobs:
           ./build_aux/bootstrap install
         shell: msys2 {0}
 
-      - name: Build environment setup
-        run: |
-          mkdir _build
-          echo "JAVA_HOME=$JAVA_HOME"
-          echo "export PATH=\"$(cygpath -u "$JAVA_HOME")/bin:\$PATH\"" >> ~/.bash_profile
-        shell: msys2 {0}
-
       - name: configure
         run: |
+          mkdir _build
           cd _build
           java_home="$(cygpath -u "$JAVA_HOME")"
           # thanks @revelator & @GitMensch ;-)
@@ -63,9 +55,11 @@ jobs:
                        --enable-hardening \
                        --prefix /opt/cobol/gnucobol \
                        --exec-prefix /opt/cobol/gnucobol \
+                       --disable-nls \
                        --without-indexed \
                        --without-json \
                        --without-xml2 \
+                       --without-curses \
                        --with-java \
                        JAVA_HOME="$java_home" \
                        JAVA="$java_home/bin/java" \
@@ -87,9 +81,6 @@ jobs:
       - name: check
         continue-on-error: true
         run: |
-          sed '/AT_SETUP(\[ACCEPT OMITTED (SCREEN)\])/a \
-                AT_SKIP_IF(\[true\])' \
-              -i tests/testsuite.src/run_accept.at
           make -C _build check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" || \
           make -C _build check TESTSUITEFLAGS="--recheck --verbose"
         shell: msys2 {0}
@@ -99,8 +90,3 @@ jobs:
         with:
           name: testsuite-${{matrix.sys}}.log
           path: _build/tests/testsuite.log
-
-      - name: install
-        run: |
-          make -C _build install
-        shell: msys2 {0}