Cleanup yaml file and synch look and feel

HDFGroup · Mar 13, 2024 · 028a2d4 · 028a2d4
1 parent be366d7
commit 028a2d4
Show file tree

Hide file tree

Showing 13 changed files with 145 additions and 167 deletions.
diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml
@@ -1,4 +1,4 @@
-name:  hdf4 autotools aocc
+name: hdf4 autotools aocc
 
 on:
   workflow_call:
@@ -20,14 +20,17 @@ jobs:
     name: "aocc ${{ inputs.build_mode }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - name: Get Sources
+        uses: actions/checkout@v4.1.1
 
-      - name: Install System dependencies
+      - name: Install Dependencies
+        shell: bash
         run: |
           sudo apt update
           sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev doxygen openssl libtool libtool-bin build-essential libncurses-dev libquadmath0 libstdc++6 libxml2
 
       - name: Install AOCC 4.1.0
+        shell: bash
         run: |
           wget https://download.amd.com/developer/eula/aocc/aocc-4-1/aocc-compiler-4.1.0.tar
           tar -xvf aocc-compiler-4.1.0.tar
@@ -43,7 +46,7 @@ jobs:
           echo "LD_RUN_PATH=/home/runner/work/hdf4/hdf4/aocc-compiler-4.1.0/lib:/usr/local/lib" >> $GITHUB_ENV
           echo "DESTDIR=/tmp" >> $GITHUB_ENV
 
-      - name: Autotools Configure with aocc
+      - name: Autotools Configure
         shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
@@ -58,7 +61,6 @@ jobs:
             --disable-fortran \
             LDFLAGS="-L/home/runner/work/hdf4/hdf4/aocc-compiler-4.1.0/lib"
 
-      # BUILD
       - name: Autotools Build
         shell: bash
         run: |
@@ -67,17 +69,16 @@ jobs:
           make -j3
         working-directory: ${{ runner.workspace }}/build
 
-      # RUN TESTS
-      # NORMAL
       - name: Autotools Run Tests
+        shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
           export PATH=/usr/local/bin:$PATH
           make check -j2
         working-directory: ${{ runner.workspace }}/build
 
-      # INSTALL (note that this runs even when we don't run the tests)
       - name: Autotools Install
+        shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
           export PATH=/usr/local/bin:$PATH
@@ -88,9 +89,11 @@ jobs:
     name: "aocc static ${{ inputs.build_mode }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - name: Get Sources
+        uses: actions/checkout@v4.1.1
 
-      - name: Install System dependencies
+      - name: Install Dependencies
+        shell: bash
         run: |
           sudo apt update
           sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev doxygen openssl libtool libtool-bin build-essential libncurses-dev libquadmath0 libstdc++6 libxml2
@@ -111,7 +114,7 @@ jobs:
           echo "LD_RUN_PATH=/home/runner/work/hdf4/hdf4/aocc-compiler-4.1.0/lib:/usr/local/lib" >> $GITHUB_ENV
           echo "DESTDIR=/tmp" >> $GITHUB_ENV
 
-      - name: Autotools Configure with aocc
+      - name: Autotools Configure
         shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
@@ -126,7 +129,6 @@ jobs:
             --enable-fortran \
             LDFLAGS="-L/home/runner/work/hdf4/hdf4/aocc-compiler-4.1.0/lib"
 
-      # BUILD
       - name: Autotools Build
         shell: bash
         run: |
@@ -135,20 +137,18 @@ jobs:
           make -j3
         working-directory: ${{ runner.workspace }}/build
 
-      # RUN TESTS
-      # NORMAL
       - name: Autotools Run Tests
+        shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
           export PATH=/usr/local/bin:$PATH
           make check -j2
         working-directory: ${{ runner.workspace }}/build
 
-      # INSTALL (note that this runs even when we don't run the tests)
       - name: Autotools Install
+        shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
           export PATH=/usr/local/bin:$PATH
           make install
         working-directory: ${{ runner.workspace }}/build
-
diff --git a/.github/workflows/aocc-cmake.yml b/.github/workflows/aocc-cmake.yml
@@ -16,9 +16,10 @@ jobs:
     name: "aocc ${{ inputs.build_mode }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - name: Get Sources
+        uses: actions/checkout@v4.1.1
 
-      - name: Install Linux dependencies
+      - name: Install Dependencies
         shell: bash
         run: |
           sudo apt update
@@ -27,6 +28,7 @@ jobs:
           sudo apt install -y libaec-dev zlib1g-dev wget curl bzip2 flex bison cmake libzip-dev openssl build-essential
 
       - name: Install AOCC 4.1.0
+        shell: bash
         run: |
           wget https://download.amd.com/developer/eula/aocc/aocc-4-1/aocc-compiler-4.1.0.tar
           tar -xvf aocc-compiler-4.1.0.tar
@@ -42,23 +44,24 @@ jobs:
           echo "LD_RUN_PATH=/home/runner/work/hdf4/hdf4/aocc-compiler-4.1.0/lib:/usr/local/lib" >> $GITHUB_ENV
           echo "DESTDIR=/tmp" >> $GITHUB_ENV
 
-      - name: CMake Configure with aocc
+      - name: CMake Configure
         shell: bash
         run: |
           source /home/runner/work/hdf4/hdf4/setenv_AOCC.sh
           export PATH=/usr/local/bin:$PATH
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
-          -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
-          -DJPEG_USE_LOCALCONTENT=OFF \
-          -DLIBAEC_USE_LOCALCONTENT=OFF \
-          -DZLIB_USE_LOCALCONTENT=OFF \
-          -DHDF4_BUILD_FORTRAN:BOOL=ON \
-          -DHDF4_BUILD_JAVA:BOOL=OFF \
-          $GITHUB_WORKSPACE
+          cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake \
+            -G Ninja \
+            --log-level=VERBOSE \
+            -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+            -DJPEG_USE_LOCALCONTENT=OFF \
+            -DLIBAEC_USE_LOCALCONTENT=OFF \
+            -DZLIB_USE_LOCALCONTENT=OFF \
+            -DHDF4_BUILD_FORTRAN:BOOL=ON \
+            -DHDF4_BUILD_JAVA:BOOL=OFF \
+            $GITHUB_WORKSPACE
 
-      # BUILD
       - name: CMake Build
         shell: bash
         run: |
@@ -67,7 +70,6 @@ jobs:
           cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
         working-directory: ${{ runner.workspace }}/build
 
-      # RUN TESTS
       - name: CMake Run Tests
         shell: bash
         run: |

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -21,7 +21,7 @@ jobs:
 
     call-release-netcdf-cmake-mingw:
         name: "CMake Release NetCDF MinGW Workflows"
-        uses: ./.github/workflows/main-cmake-mingw.yml
+        uses: ./.github/workflows/mingw-cmake.yml
         with:
             netcdf: "true"
             shared: "true"

diff --git a/.github/workflows/cygwin-auto.yml b/.github/workflows/cygwin-auto.yml
@@ -1,4 +1,4 @@
-name: hdf4 dev autotools cygwin
+name: hdf4 autotools cygwin
 
 on:
   workflow_call:
@@ -17,14 +17,15 @@ permissions:
 
 jobs:
   cygwin_build_and_test:
-    name: "Cygwin ${{ inputs.build_mode }}"
+    name: "cygwin ${{ inputs.build_mode }}"
     runs-on: windows-latest
     steps:
       - name: Set git to use LF
         run: |
           git config --global core.autocrlf input
 
-      - uses: actions/checkout@v4.1.1
+      - name: Get Sources
+        uses: actions/checkout@v4.1.1
 
       - name: Install Cygwin
         uses: cygwin/cygwin-install-action@master
@@ -43,16 +44,13 @@ jobs:
             --enable-shared \
             --disable-fortran
 
-      # BUILD
       - name: Autotools Build
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
         run: |
           export PATH=/usr/bin:$PATH
           cd build
           make -j3
 
-      # RUN TESTS
-      # NORMAL
       - name: Autotools Run Tests
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
         run: |

diff --git a/.github/workflows/cygwin-cmake.yml b/.github/workflows/cygwin-cmake.yml
@@ -1,4 +1,4 @@
-name: hdf4 dev CMake cygwin
+name: hdf4 CMake cygwin
 
 on:
   workflow_call:
@@ -20,7 +20,8 @@ jobs:
         run: |
           git config --global core.autocrlf input
 
-      - uses: actions/checkout@v4.1.1
+      - name: Get Sources
+        uses: actions/checkout@v4.1.1
 
       - name: Install Cygwin
         uses: cygwin/cygwin-install-action@master
@@ -34,25 +35,24 @@ jobs:
           mkdir build
           cd build
           cmake -C ../config/cmake/cacheinit.cmake \
-          -G Ninja \
-          -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
-          -DBUILD_SHARED_LIBS:BOOL=OFF \
-          -DJPEG_USE_LOCALCONTENT=OFF \
-          -DLIBAEC_USE_LOCALCONTENT=OFF \
-          -DZLIB_USE_LOCALCONTENT=OFF \
-          -DHDF4_BUILD_FORTRAN:BOOL=ON \
-          -DHDF4_BUILD_JAVA:BOOL=OFF \
-          ..
-
-      # BUILD
+            -G Ninja \
+            --log-level=VERBOSE \
+            -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
+            -DBUILD_SHARED_LIBS:BOOL=OFF \
+            -DJPEG_USE_LOCALCONTENT=OFF \
+            -DLIBAEC_USE_LOCALCONTENT=OFF \
+            -DZLIB_USE_LOCALCONTENT=OFF \
+            -DHDF4_BUILD_FORTRAN:BOOL=ON \
+            -DHDF4_BUILD_JAVA:BOOL=OFF \
+            ..
+
       - name: CMake Build
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
         run: |
           export PATH=/usr/bin:$PATH
           cd build
           cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
 
-      # RUN TESTS
       - name: CMake Run Tests
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
         run: |

diff --git a/.github/workflows/intel-auto.yml b/.github/workflows/intel-auto.yml
@@ -1,4 +1,4 @@
-name: hdf4 dev autotools icx CI
+name: hdf4 autotools icx
 
 on:
   workflow_call:
@@ -16,18 +16,20 @@ permissions:
   contents: read
 
 jobs:
-  Intel_build_and_test:
-    name: "Intel ${{ inputs.build_mode }}"
+  intel_build_and_test:
+    name: "oneapi ${{ inputs.build_mode }}"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - name: Get Sources
+        uses: actions/checkout@v4.1.1
 
       - name: Install Dependencies
+        shell: bash
         run: |
           sudo apt-get update
           sudo apt-get install autoconf automake libtool libtool-bin libaec-dev
 
-      - name: Add oneAPI to apt
+      - name: Install oneAPI
         shell: bash
         run: |
           cd /tmp
@@ -66,26 +68,25 @@ jobs:
             --enable-shared \
             --disable-fortran
 
-      # BUILD
       - name: Autotools Build
+        shell: bash
         run: |
           source /opt/intel/oneapi/setvars.sh
           export PATH=$PATH:/opt/intel/oneapi/compiler/2023.2.1/linux/bin
           make -j3
         working-directory: ${{ runner.workspace }}/build
 
-      # RUN TESTS
-      # NORMAL
       - name: Autotools Run Tests
+        shell: pwsh
         run: |
           source /opt/intel/oneapi/setvars.sh
           export PATH=$PATH:/opt/intel/oneapi/compiler/2023.2.1/linux/bin
           export SYCL_DEVICE_FILTER=opencl.cpu
           make check -j2
         working-directory: ${{ runner.workspace }}/build
 
-      # INSTALL (note that this runs even when we don't run the tests)
       - name: Autotools Install
+        shell: pwsh
         run: |
           source /opt/intel/oneapi/setvars.sh
           export PATH=$PATH:/opt/intel/oneapi/compiler/2023.2.1/linux/bin