ci: use 7.4

hyoklee · Mar 1, 2024 · 232b3b9 · 232b3b9
2 parents e657a5b + ff5e551
commit 232b3b9
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 deletions.
diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
@@ -25,8 +25,8 @@ jobs:
             apt-get install -q -y git cmake libjpeg-dev zlib1g zlib1g-dev
           run: |
             echo ::set-output name=uname::$(uname -a)
-            git clone https://github.com/hyoklee/hdf4
-            cd hdf4
+            git clone https://github.com/hyoklee/h4
+            cd h4
             mkdir build
             cd build
             cmake -DHDF4_BUILD_FORTRAN:BOOL=OFF ..

diff --git a/.github/workflows/aarch64_auto.yml b/.github/workflows/aarch64_auto.yml
@@ -26,8 +26,8 @@ jobs:
             apt-get install -q -y libtirpc-common libtirpc-dev libtirpc3
           run: |            
             echo ::set-output name=uname::$(uname -a)
-            git clone https://github.com/hyoklee/hdf4
-            cd hdf4
+            git clone https://github.com/hyoklee/h4
+            cd h4
             ./ci.sh
 
       - name: Get the output

diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml
@@ -33,6 +33,11 @@ jobs:
           shell: bash          
           run: |
             sudo pkg_add git
+<<<<<<< HEAD:.github/workflows/arm64.yml
+=======
+            git clone https://github.com/hyoklee/h4
+            cd hdf4
+>>>>>>> ff5e551f3bb2a9c1c0d7b12d697a53a5eff04ef0:.github/workflows/openbsd_arm64.yml
             sudo pkg_add cmake
             sudo pkg_add jpeg
             mkdir build

diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -32,29 +32,29 @@ jobs:
         cd ../..
         chmod u+x ./autogen.sh        
         ./autogen.sh
-        ./configure CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar --disable-gssapi --host=aarch64-linux-musl  --prefix=/usr
+        ./configure CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar --disable-gssapi --host=aarch64-linux-musl  --prefix=/usr
         make
         sudo make install
         cd ..        
         wget -q https://gamma.hdfgroup.org/ftp/pub/outgoing/h4map/src/h4map.tar.gz
         tar -xzf h4map.tar.gz
         cd h4map/jpeg-6b
-        ./configure CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar
+        ./configure CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar
         make
         sudo make install-lib
         cd ../..
         pwd
         ls
         git clone https://github.com/madler/zlib
         cd zlib
-        CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar ./configure
+        CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar ./configure
         make
         sudo make install
         cd ..
         pwd
         ls
         mkdir build
         cd build
-        cmake -DCMAKE_C_COMPILER=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc -DCMAKE_AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar -DCMAKE_SYSTEM_PROCESSOR=aarch64-linux-musl -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF4_BUILD_FORTRAN:BOOL=OFF ..        
+        cmake -DCMAKE_C_COMPILER=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc -DCMAKE_AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar -DCMAKE_SYSTEM_PROCESSOR=aarch64-linux-musl -DBUILD_SHARED_LIBS:BOOL=OFF -DHDF4_BUILD_FORTRAN:BOOL=OFF ..        
         make
         make test
diff --git a/.github/workflows/linux-aarch64_auto.yml b/.github/workflows/linux-aarch64_auto.yml
@@ -32,28 +32,28 @@ jobs:
         cd ../..
         chmod u+x ./autogen.sh
         ./autogen.sh
-        ./configure CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar --disable-gssapi --host=aarch64-linux-musl --prefix=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross
+        ./configure CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar --disable-gssapi --host=aarch64-linux-musl --prefix=/home/runner/work/h4/h4/aarch64-linux-musl-cross
         make
         sudo make install
         cd ..        
         wget -q https://gamma.hdfgroup.org/ftp/pub/outgoing/h4map/src/h4map.tar.gz
         tar -xzf h4map.tar.gz
         cd h4map/jpeg-6b
-        ./configure CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar --prefix=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross
+        ./configure CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar --prefix=/home/runner/work/h4/h4/aarch64-linux-musl-cross
         make
         sudo make install-lib
         cd ../..
         pwd
         ls
         git clone https://github.com/madler/zlib
         cd zlib
-        CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar ./configure --prefix=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross
+        CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar ./configure --prefix=/home/runner/work/h4/h4/aarch64-linux-musl-cross
         make
         sudo make install
         cd ..
         pwd
         ls
         autoreconf -fvi
-        ./configure CC=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc CXX=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-g++  AR=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar CFLAGS="-I/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/include/tirpc/" LDFLAGS="-L/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross/lib/ -ltirpc" --host=aarch64-linux-musl --disable-netcdf --disable-fortran --prefix=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross --with-jpeg=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross --with-zlib=/home/runner/work/hdf4/hdf4/aarch64-linux-musl-cross
+        ./configure CC=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc CXX=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-g++  AR=/home/runner/work/h4/h4/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar CFLAGS="-I/home/runner/work/h4/h4/aarch64-linux-musl-cross/include/tirpc/" LDFLAGS="-L/home/runner/work/h4/h4/aarch64-linux-musl-cross/lib/ -ltirpc" --host=aarch64-linux-musl --disable-netcdf --disable-fortran --prefix=/home/runner/work/h4/h4/aarch64-linux-musl-cross --with-jpeg=/home/runner/work/h4/h4/aarch64-linux-musl-cross --with-zlib=/home/runner/work/h4/h4/aarch64-linux-musl-cross
         make
         make check
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -33,6 +33,11 @@ jobs:
           shell: bash          
           run: |
             sudo pkg_add git
+<<<<<<< HEAD:.github/workflows/r.yml
+=======
+            git clone https://github.com/hyoklee/h4
+            cd hdf4
+>>>>>>> ff5e551f3bb2a9c1c0d7b12d697a53a5eff04ef0:.github/workflows/openbsd.yml
             sudo pkg_add cmake
             sudo pkg_add jpeg
             mkdir build

diff --git a/README.md b/README.md
@@ -9,6 +9,11 @@
 
 [![amd64 clang/gcc Autotools/CMake](https://github.com/hyoklee/h4/actions/workflows/main.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/main.yml)
 
+<<<<<<< HEAD
 [![amd64](https://github.com/hyoklee/h4/actions/workflows/openbsd.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/r.yml)
 [![arm64](https://github.com/hyoklee/h4/actions/workflows/openbsd_arm64.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/arm64.yml)
+=======
+[![amd64 OpenBSD 7.2 CMake](https://github.com/hyoklee/h4/actions/workflows/openbsd.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/openbsd.yml)
+[![arm64 OpenBSD 7.2 CMake](https://github.com/hyoklee/h4/actions/workflows/openbsd_arm64.yml/badge.svg)](https://github.com/hyoklee/h4/actions/workflows/openbsd_arm64.yml)
+>>>>>>> ff5e551f3bb2a9c1c0d7b12d697a53a5eff04ef0