From 17461c57b83d315ebe9cfd8d60c1401b2cc3bacb Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 6 May 2020 12:33:04 -0500
Subject: Add github actions file and cleanup java

---
 .github/workflows/main.yml | 80 ++++++++++++++++++++++++++++++++++++++++++++++
 MANIFEST                   |  2 ++
 java/src/jni/h5sImp.c      |  2 +-
 java/src/jni/h5sImp.h      |  2 +-
 java/test/TestH5E.java     |  4 ++-
 5 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..5c38961
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,80 @@
+name: hdf5 dev CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+on:
+  push:
+    branches: [ develop, hdf5_1_12, hdf5_1_10, hdf5_1_8 ]
+  pull_request:
+    branches: [ develop ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "macOS Latest Clang"]
+        include:
+          - name: "Windows Latest MSVC"
+            artifact: "Windows-MSVC.tar.xz"
+            os: windows-latest
+            build_type: "Release"
+            toolchain: ""
+            fortran: OFF
+            generator: "-G \"Visual Studio 16 2019\" -A x64"
+          - name: "Ubuntu Latest GCC"
+            artifact: "Linux.tar.xz"
+            os: ubuntu-latest
+            build_type: "Release"
+            fortran: OFF
+            toolchain: "config/toolchain/GCC.cmake"
+            generator: "-G Ninja"
+          - name: "macOS Latest Clang"
+            artifact: "macOS.tar.xz"
+            os: macos-latest
+            build_type: "Release"
+            fortran: OFF
+            toolchain: "config/toolchain/clang.cmake"
+            generator: "-G Ninja"
+
+    name: ${{ matrix.name }}
+    # The type of runner that the job will run on
+    runs-on: ${{ matrix.os }}
+          
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - name: Install Dependencies (Linux)
+      run: sudo apt-get install ninja-build
+      if: matrix.os == 'ubuntu-latest'
+    - name: Install Dependencies (Windows)
+      run: choco install ninja
+      if: matrix.os == 'windows-latest'
+    - name: Install Dependencies (macOS)
+      run: brew install ninja
+      if: matrix.os == 'macos-latest'
+    - name: Set environment for MSVC (Windows)
+      if:  matrix.os == 'windows-latest'
+      run: |
+        # Set these env vars so cmake picks the correct compiler
+        echo "::set-env name=CXX::cl.exe"
+        echo "::set-env name=CC::cl.exe"
+    
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - name: Get Sources
+      uses: actions/checkout@v2
+
+    - name: Configure
+      run: |
+        mkdir "${{ runner.workspace }}/build"
+        cd "${{ runner.workspace }}/build"
+        cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
+      shell: bash
+
+    - name: Build
+      run: cmake --build . --config ${{ matrix.build_type }}
+      working-directory: ${{ runner.workspace }}/build      
+
+    - name: Test
+      run: ctest --build . -C ${{ matrix.build_type }} -V
+      working-directory: ${{ runner.workspace }}/build
diff --git a/MANIFEST b/MANIFEST
index 152fb1c..8972ec3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -33,6 +33,8 @@
 ./autogen.sh
 ./configure.ac
 
+./github/workflows/main.yml  _DO_NOT_DISTRIBUTE_
+
 ./m4/aclocal_cxx.m4
 ./m4/aclocal_fc.m4
 ./m4/aclocal_fc.f90
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index 8d84314..4dfa225 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -165,7 +165,7 @@ done:
 /* 10/28/99 -- added code to copy the array -- this is not used,
  * but serves as a reminder in case we try to implement this in
  * the future....
- */ 
+ */
 /*
  *  Note:  the argument coord is actually long coord[][], which has been
  *         flattened by the caller.
diff --git a/java/src/jni/h5sImp.h b/java/src/jni/h5sImp.h
index a07d4c5..cea2ebf 100644
--- a/java/src/jni/h5sImp.h
+++ b/java/src/jni/h5sImp.h
@@ -52,7 +52,7 @@ Java_hdf_hdf5lib_H5__1H5Scopy
 /* 10/28/99 -- added code to copy the array -- this is not used,
  * but serves as a reminder in case we try to implement this in
  * the future....
- */ 
+ */
 /*
  *  Note:  the argument coord is actually long coord[][], which has been
  *         flattened by the caller.
diff --git a/java/test/TestH5E.java b/java/test/TestH5E.java
index 1f4e658..ad50d62 100644
--- a/java/test/TestH5E.java
+++ b/java/test/TestH5E.java
@@ -85,6 +85,7 @@ public class TestH5E {
             long errnum = hdferr.getMajorErrorNumber();
             int[] error_msg_type = { HDF5Constants.H5E_MAJOR };
             String msg = null;
+
             try {
                 msg = H5.H5Eget_msg(errnum, error_msg_type);
             }
@@ -111,6 +112,7 @@ public class TestH5E {
             long errnum = hdferr.getMinorErrorNumber();
             int[] error_msg_type = { HDF5Constants.H5E_MINOR };
             String msg = null;
+
             try {
                 msg = H5.H5Eget_msg(errnum, error_msg_type);
             }
@@ -144,7 +146,7 @@ public class TestH5E {
         catch (Throwable err) {
         }
 
-        // save current stack contents
+        // Save current stack contents
         try {
             current_stackid = H5.H5Eget_current_stack();
         }
-- 
cgit v0.12