More Github CI fixes...

tschoonj · Jun 13, 2020 · 4f3e93b · 4f3e93b
1 parent caf504c
commit 4f3e93b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,16 +33,18 @@ jobs:
       if: startsWith(matrix.image, 'ubuntu') || startsWith(matrix.image, 'debian')
       run: |
         set -ex
-        export DEBIAN_FRONTEND=noninteractive
         apt-get --yes --force-yes update
         apt-get --yes --force-yes install python3-pip python3-all-dev python3-numpy fpc gfortran gcc php-dev swig libperl-dev perl lua5.3 liblua5.3-dev ruby-dev default-jdk
         pip3 install Cython
         set +ex
+      env:
+        DEBIAN_FRONTEND: noninteractive
     - name: Build and test
       run: |
         set -ex
         autoreconf -fi
-        ./configure --disable-python --disable-python-numpy --enable-perl --enable-lua --enable-pascal --enable-java --enable-php --enable-ruby
+        # disable java for now
+        ./configure --disable-python --disable-python-numpy --enable-perl --enable-lua --enable-pascal --disable-java --enable-php --enable-ruby
         make
         make check
         make distclean
@@ -65,3 +67,4 @@ jobs:
         CC: ${{matrix.cc}}
         XRL_PYTHON3: /usr/bin/python3
         LUA: /usr/bin/lua5.3
+        JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
diff --git a/example/Makefile.am b/example/Makefile.am
@@ -54,6 +54,9 @@ endif
 
 xrlexample1_SOURCES = xrlexample1.c
 xrlexample1_LDADD = ../src/libxrl.la
+if !OS_WINDOWS
+xrlexample1_LDADD += -lm
+endif
 xrlexample1_CPPFLAGS = -I${top_srcdir}/include -I${top_builddir}/include
 xrlexample1_CFLAGS = $(ARCHFLAGS) $(WSTRICT_CFLAGS)
 
@@ -68,6 +71,9 @@ endif
 if ENABLE_CXX
   xrlexample6_SOURCES = xrlexample6.cpp
   xrlexample6_LDADD = ../src/libxrl.la
+if !OS_WINDOWS
+  xrlexample6_LDADD += -lm
+endif
 endif
 
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -73,6 +73,9 @@ test_cross_sections_LDADD = ../src/libxrl.la
 
 test_crystal_diffraction_SOURCES = test-crystal_diffraction.c
 test_crystal_diffraction_LDADD = ../src/libxrl.la
+if !OS_WINDOWS
+test_crystal_diffraction_LDADD += -lm
+endif
 
 test_cs_barns_SOURCES = test-cs_barns.c
 test_cs_barns_LDADD = ../src/libxrl.la