Merge pull request #84 from lclevy/devel

Merge devel (ie. release 0.9.0) to the master

Author: t-w

.github/workflows/autotools.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         conf_options: [ "", --enable-native-generic ]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
       run: sudo apt-get update ; sudo apt-get install -y check
     - name: autogen
@@ -36,18 +36,34 @@ jobs:
       run: sudo ldconfig
     - name: test installed command-line utils
       run: ./examples/tests/test-all-examples.sh /usr/local/bin
+    - name: store logs from failed tests
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: ubuntu_autotools_logs_failed_tests
+        path: |
+          examples/tests/*.log
+          regtests/Test/*.log
+          tests/*.log
 
-  cygwin_native_default:
+  cygwin:
     runs-on: windows-latest
     defaults:
       run:
-        shell: C:\tools\cygwin\bin\bash.exe '{0}'
-    env:
-      SHELLOPTS: igncr
+        shell: C:\cygwin\bin\bash.exe '{0}'
+#    env:
+#      SHELLOPTS: igncr
     steps:
-    - uses: actions/checkout@v3
-    - uses: egor-tensin/setup-cygwin@v4
+    - name: setup git (eol)
+#      shell: powershell
+      shell: cmd
+      run: |
+        git config --global core.autocrlf false
+#        git config --global core.eol lf
+    - uses: actions/checkout@v4
+    - uses: cygwin/cygwin-install-action@v4
       with:
+        site: https://sunsite.icm.edu.pl/pub/cygnus/cygwin/
         packages: autoconf automake check diffutils findutils gcc-core grep gzip libtool make sed tar
     - name: autogen
       run: ./autogen.sh
@@ -65,16 +81,26 @@ jobs:
       run: find /tmp/adflib -iname '*adf*'
     - name: test installed command-line utils
       run: ./examples/tests/test-all-examples.sh /tmp/adflib/bin
+    - name: store logs from failed tests
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: cygwin_autotools_native_logs_failed_tests
+        path: |
+          examples/tests/*.log
+          regtests/Test/*.log
+          tests/*.log
+#          C:\cygwin\var\log\setup.log.full
 
-  msys2_native_default:
-    if: false
+  msys2:
+#    if: false
     runs-on: windows-latest
     defaults:
       run:
         shell: msys2 '{0}'
     steps:
-    - uses: actions/checkout@v3
-    - uses: msys2/setup-msys2@v2
+    - uses: actions/checkout@v4
+    - uses: msys2/setup-msys2@v2.22.0
       with:
         update: true
         install: autotools diffutils mingw-w64-x86_64-check mingw-w64-x86_64-toolchain
@@ -85,7 +111,8 @@ jobs:
     - name: make
       run: make
     - name: make check
-      run: ( make check || grep . examples/*.log examples/tests/*.log )
+      #run: ( make check || grep . examples/*.log examples/tests/*.log )
+      run: make check
     - name: make distcheck
       run: make distcheck
     - name: make install
@@ -94,13 +121,22 @@ jobs:
       run: find /tmp/adflib -iname '*adf*'
     - name: test installed command-line utils
       run: ./examples/tests/test-all-examples.sh /tmp/adflib/bin
+    - name: store logs from failed tests
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: msys2_autotools_logs_failed_tests
+        path: |
+          examples/tests/*.log
+          regtests/Test/*.log
+          tests/*.log
 
-  macos_native_default:
+  macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
-      run: brew install automake check
+      run: brew install automake check libtool
     - name: autogen
       run: ./autogen.sh
     - name: configure
@@ -112,8 +148,17 @@ jobs:
     - name: make distcheck
       run: make distcheck
     - name: make install
-      run: make install
+      run: sudo make install
     - name: check installation
       run: find /usr/local/ -iname '*adf*'
     - name: test installed command-line utils
       run: ./examples/tests/test-all-examples.sh /usr/local/bin
+    - name: store logs from failed tests
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: macos_autotools_native_logs_failed_tests
+        path: |
+          examples/tests/*.log
+          regtests/Test/*.log
+          tests/*.log

.github/workflows/cmake.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         build_type: [ shared, debug ]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
       run: sudo apt-get update ; sudo apt-get install -y check
     - name: cmake_${{ matrix.build_type }}_configure
@@ -36,7 +36,7 @@ jobs:
   windows_build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
       run: |
         choco install ninja cmake
@@ -94,7 +94,7 @@ jobs:
       run: |
         echo $ADFLIB_TAG
         echo ${{ env.ADFLIB_TAG }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-windows
         name: adflib-windows
@@ -105,27 +105,27 @@ jobs:
       run: |
         mkdir -v artifact-tests
         tar cvzf artifact-tests/examples_tests.tgz examples/tests/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
-        name: adflib-examples-tests
+        name: adflib-windows-examples-tests
         path: |
           artifact-tests
 
   windows_test:
     runs-on: windows-latest
     needs: windows_build
     steps:
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-windows
         name: adflib-windows
         path: .
     - name: list files extracted from the artifact
       shell: bash
       run: find .
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
-        name: adflib-examples-tests
+        name: adflib-windows-examples-tests
         path: .
     - name: extract examples/tests
       shell: bash
@@ -141,7 +141,7 @@ jobs:
   macos_shared:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
       run: |
         brew install cmake ninja coreutils
@@ -154,6 +154,8 @@ jobs:
       run: util/cmake_shared_build
     - name: cmake_shared_test
       run: util/cmake_shared_test
+    - name: show properties of binaries in the build tree (not installed)
+      run: otool -l build/shared/examples/unadf
     - name: cmake_shared_install
       run: sudo bash util/cmake_shared_install
     - name: check installation
@@ -168,7 +170,7 @@ jobs:
             /usr/local/include/*adf*
             /usr/local/lib/*adf*
 #            /usr/local/share/man/man3/*adf*
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-windows
         name: adflib-macos
@@ -178,9 +180,9 @@ jobs:
       run: |
         mkdir -v artifact-tests
         tar cvzf artifact-tests/examples_tests.tgz examples/tests/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
-        name: adflib-examples-tests
+        name: adflib-macos-examples-tests
         path: |
           artifact-tests
 
@@ -189,18 +191,24 @@ jobs:
     needs: macos_shared
     runs-on: macos-latest
     steps:
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
 #      name: adflib-${{ env.ADFLIB_TAG }}-macos
         name: adflib-macos
         path: .
     - name: extract file from the artifact
-      run: tar xzv -C / -f adflib-macos.tgz
+      run: sudo tar xzv -C / -f adflib-macos.tgz
     - name: list files extracted from the artifact
       run: find /usr/local -name "*adf*"
-    - uses: actions/download-artifact@master
+    - name: list installed library files
+      run: ls -l /usr/local/lib/*adf*
+#    - name: update dyld's shared cache
+#      run: sudo update_dyld_shared_cache -debug
+    - name: show properties of binaries (installed)
+      run: otool -l /usr/local/bin/unadf
+    - uses: actions/download-artifact@v4
       with:
-        name: adflib-examples-tests
+        name: adflib-macos-examples-tests
         path: .
     - name: extract examples/tests
       run: tar xzvf examples_tests.tgz

.github/workflows/deb-debian.yml

@@ -18,7 +18,7 @@ jobs:
     container:
       image: debian:${{ matrix.image }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
       run:
         apt-get update &&
@@ -39,7 +39,7 @@ jobs:
     #  run: |
     #    echo $ADFLIB_TAG
     #    echo ${{ env.ADFLIB_TAG }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
         name: adflib-debian-${{ matrix.image }}
@@ -49,7 +49,7 @@ jobs:
       run: |
         mkdir -v artifact-tests
         tar cvzf artifact-tests/examples_tests.tgz examples/tests/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: adflib-examples-tests-${{ matrix.image }}
         path: |
@@ -64,7 +64,7 @@ jobs:
     container:
       image: debian:${{ matrix.image }}
     steps:
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
         name: adflib-debian-${{ matrix.image }}
@@ -84,7 +84,7 @@ jobs:
         dpkg -l 'libadf*' ;
         dpkg -l 'libadf*' | grep "libadf" |
         cut -d' ' -f 3 | cut -d':' -f 1 | xargs dpkg -L
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-deb-debian
         name: adflib-examples-tests-${{ matrix.image }}

.github/workflows/deb-ubuntu.yml

@@ -2,17 +2,18 @@ name: deb packaging Ubuntu
 
 on:
   push:
-    branches: [ "master", "devel", "citest", "citest-deb" ]
+#    branches: [ "master", "devel", "citest", "citest-deb" ]
+    branches: [ "citest", "citest-deb" ]
     tags:
       - '**'
-  pull_request:
-    branches: [ "master", "devel" ]
+#  pull_request:
+#    branches: [ "master", "devel" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install prereq.
       run:
         sudo apt-get update &&
@@ -33,7 +34,7 @@ jobs:
       run: |
         echo $ADFLIB_TAG
         echo ${{ env.ADFLIB_TAG }}
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
         name: adflib-deb-ubuntu
@@ -43,7 +44,7 @@ jobs:
       run: |
         mkdir -v artifact-tests
         tar cvzf artifact-tests/examples_tests.tgz examples/tests/
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: adflib-examples-tests
         path: |
@@ -53,7 +54,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
         name: adflib-deb-ubuntu
@@ -68,7 +69,7 @@ jobs:
         dpkg -l 'libadf*' ;
         dpkg -l 'libadf*' | grep "libadf" |
         cut -d' ' -f 3 | cut -d':' -f 1 | xargs dpkg -L
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v4
       with:
 #        name: adflib-${{ env.ADFLIB_TAG }}-deb-ubuntu
         name: adflib-examples-tests