Merge pull request #174 from akrherz/gh173_dfmfrq

Fix dfmfrq and Fix CI

Author: akrherz

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    labels:
+      - "Bot"
+    groups:
+      github-actions:
+        patterns:
+          - '*'

.github/workflows/main.yml

@@ -3,40 +3,37 @@ name: CI
 on: ["push", "pull_request"]
 
 jobs:
-  build_ubuntu:
-    name: Build Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: build
-      run: |
-        sudo apt-get update
-        sudo apt install gcc build-essential libx11-dev libxt-dev libxext-dev libxft-dev libxtst-dev 
-        sudo apt install flex byacc libmotif-common libmotif-dev libxpm4 libxpm-dev
-        sudo apt install gfortran
-        . Gemenviron.profile
-        rm -f config/Makeinc.linux64_gfortran
-        ln -s `pwd`/config/Makeinc.linux64_gfortran_ubuntu config/Makeinc.linux64_gfortran
-        make all
-
   build:
-    name: Build Centos (${{ matrix.OS_VERSION }})
+    name: Build ${{ matrix.os_type }} (${{ matrix.os_version }})
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     strategy:
       matrix:
-        OS_VERSION: ["7", "stream8"]
-    env:
-      OS_VERSION: ${{ matrix.OS_VERSION }}
-      OS_TYPE: "centos"
+        include:
+          - os_type: ubuntu
+            os_version: "24.04"
+            container_image: ubuntu:24.04
+            release_glob: build/dist/*.deb
+          - os_type: almalinux
+            os_version: "8"
+            container_image: quay.io/almalinuxorg/8-base
+            release_glob: build/dist/*.rpm
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+
+    - name: Pull container image
+      run: |
+        sudo docker pull ${{ matrix.container_image }}
 
     - name: build
       run: |
-        echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
-        sudo service docker restart
-        sleep 5
-        sudo docker pull quay.io/centos/${OS_TYPE}:${OS_VERSION}
-        build/setup.sh ${OS_TYPE} ${OS_VERSION}
+        build/setup.sh ${{ matrix.os_type }} ${{ matrix.os_version }}
 
+    - name: Attach assets to GitHub Release
+      if: github.ref_type == 'tag'
+      uses: softprops/action-gh-release@v2
+      with:
+        files: |
+          ${{ matrix.release_glob }}
+        fail_on_unmatched_files: true

CHANGELOG.md

@@ -1,6 +1,11 @@
 <!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
 # Unidata Community GEMPAK Change Log
 
+## Unreleased Version
+
+- Previously when building, `make` errors would not error the build.  This will
+  be changing going forward so to prevent broken builds.  The year is 2026.
+
 ## 7.20.0 (16 Jan 2026)
 
 This release merges NCEP NAWIPS 7.20.0.

Makefile

@@ -35,7 +35,7 @@ SUBDIRS = \
 all : INSTALLDIRS
 	@for dir in $(SUBDIRS); do \
 	   ( cd $$dir; echo "Making $@ in `pwd`" ; \
-		$(MAKE) $(MFLAGS) $@ ) ; \
+		$(MAKE) $(MFLAGS) $@ ) || exit $$?; \
 	done
 
 All : all
@@ -71,7 +71,7 @@ install : INSTALLDIRS
 			NODIR) ;; \
 			*) if [ -d $$dir ]; then \
 				(cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ; \
+				$(MAKE) $(MFLAGS) $@) || exit $$?; \
 			   else \
 				echo "Skipping $$dir"; \
 			   fi; \
@@ -85,7 +85,7 @@ install : INSTALLDIRS
 			NODIR) ;; \
 			*) if [ -d $$dir ]; then \
 				(cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ; \
+				$(MAKE) $(MFLAGS) $@) || exit $$?; \
 			   else \
 				echo "Skipping $$dir"; \
 			   fi; \
@@ -101,7 +101,7 @@ clean:
 			NODIR) ;; \
 			*) if [ -d $$dir ]; then \
 				(cd $$dir; echo "Making $@ in `pwd`" ; \
-				$(MAKE) $(MFLAGS) $@) ; \
+				$(MAKE) $(MFLAGS) $@) || exit $$?; \
 			   else \
 				echo "Skipping $$dir"; \
 			   fi; \

build/DEBIAN/control

@@ -3,5 +3,5 @@ Version: 7.20.0
 Maintainer: Daryl Herzmann
 Architecture: all
 Description: Unidata GEMPAK Distribution
-Depends: libgfortran3, libx11-6, libxm4, libxtst6, libxt6
+Depends: libgfortran5 | libgfortran4 | libgfortran3, libx11-6, libxm4, libxtst6, libxt6
 Homepage: https://www.unidata.ucar.edu/software/gempak/

build/Installer.gempak/fedora.spec

@@ -54,6 +54,7 @@ rm -rf Makeinc.linux64_gfortran
 ln -s Makeinc.linux64_gfortran_fedora Makeinc.linux64_gfortran
 popd
 
+make extlibs #>& make.extlibs
 make gempak #>& make.gempak
 make install >& /dev/null
 make programs_gf >& /dev/null

build/Installer.gempak/gempak.spec

@@ -42,17 +42,19 @@ tar -xvzf /tmp/rpmbuild/SOURCES/gempak-%{version}.tar.gz -C %{prefix}/ >& /dev/n
 
 %install
 # create build root directory
+set -ex
 pushd %{gem_home}
 export NAWIPS=`pwd`
 cat source_python.sh
 cat source_python.sh >> build/Installer.gempak/Gemenviron.profile
 . build/Installer.gempak/Gemenviron.profile
 # TODO: ". source_python.sh" doesn't seem to work from spec file
+make extlibs #>& make.extlibs
 make gempak #>& make.gempak
-make install >& /dev/null
-make programs_gf >& /dev/null
-make programs_nc >& /dev/null
-make clean >& /dev/null
+make install
+make programs_gf
+make programs_nc
+make clean
 
 #grep -i error make.gempak
 #rm -rf make.gempak

build/build_centos.sh build/build_almalinux.shbuild/build_centos.sh renamed to build/build_almalinux.sh

@@ -1,7 +1,6 @@
 #!/bin/sh -xe
 
-# runs on centos7, so no dnf
-yum -y -q install make gcc-gfortran git rpm-build byacc flex libX11-devel libXext libXft-devel libXp-devel libXt-devel libXtst-devel openmotif-devel xorg-x11-xbitmaps autoconf libtool automake
+dnf -y -q install make gcc-gfortran gcc-c++ git rpm-build byacc flex libX11-devel libXext libXft-devel libXp-devel libXt-devel libXtst-devel openmotif-devel xorg-x11-xbitmaps autoconf libtool automake libxml2-devel libxslt-devel
 
 useradd gempak
 

build/build_ubuntu.sh

@@ -1,27 +1,43 @@
 #!/bin/sh -xe
 ls -l /home
 
+export DEBIAN_FRONTEND=noninteractive
+apt-get update -y
+apt-get install -y --no-install-recommends \
+	git gcc gfortran build-essential \
+	libx11-dev libxt-dev libxext-dev libxft-dev libxtst-dev \
+	flex byacc libmotif-common libmotif-dev libxpm4 libxpm-dev \
+	dpkg-dev ca-certificates
+
 # Package GEMPAK source from HEAD
 pushd /gempak
 package_version=`grep "define version" build/Installer.gempak/gempak.spec | grep -v version_core| awk '{print $3}'`
-git archive --format=tar --prefix=gempak-${package_version}/ HEAD  | gzip >/tmp/gempak-${package_version}.tar.gz
+git config --global --add safe.directory /gempak
+git archive --format=tar --prefix=gempak-${package_version}/ -o /tmp/gempak-${package_version}.tar HEAD
+gzip -f /tmp/gempak-${package_version}.tar
 
 # Prepare the environment
 mkdir -p /tmp/gempak-${package_version}/
 
 cp -r /gempak/build/DEBIAN /tmp/gempak-${package_version}/
 
 mkdir -p /home/gempak/
+srcdir=$(tar -tzf /tmp/gempak-${package_version}.tar.gz | awk -F/ 'NF>1{print $1; exit}')
+if [ -z "$srcdir" ]; then
+	echo "Failed to determine top-level source directory from /tmp/gempak-${package_version}.tar.gz" >&2
+	exit 1
+fi
 tar -xvzf /tmp/gempak-${package_version}.tar.gz -C /home/gempak >& /dev/null
+rm -rf /home/gempak/GEMPAK7
+mv "/home/gempak/${srcdir}" /home/gempak/GEMPAK7
 pushd /home/gempak
-mv gempak-${package_version} GEMPAK7
 cd GEMPAK7
 . Gemenviron.profile
-export PYINC="-I/usr/include/python2.7"
-export PYLIB="-lpython2.7"
-export WITHPY="-DWITHPYTHON"
-export PYDEP="-lpthread -lutil -ldl"
-export LDFLAGS="-L/usr/lib -L$OS_LIB -s"
+export PYINC=""
+export PYLIB=""
+export WITHPY=""
+export PYDEP=""
+export LDFLAGS="-L$OS_LIB -s"
 
 pushd config
 rm -rf Makeinc.linux64_gfortran
@@ -61,4 +77,4 @@ cp gempak-${package_version}.deb /gempak/build/dist/
 # Confirm install with dependencies
 apt-get update -y
 dpkg -i gempak-${package_version}.deb
-apt-get -f install
+apt-get -f install -y

build/setup.sh

@@ -1,37 +1,48 @@
 #!/bin/sh -xe
-# ./setup.sh centos 7
-# ./setup.sh centos stream8
-# ./setup.sh centos stream9
+# ./setup.sh almalinux 9
+# ./setup.sh almalinux 10
 # ./setup.sh fedora latest
 # ./setup.sh ubuntu latest
 
 os_type=$1
 os_version=$2
 TAG=${os_type}${os_version}
 
+if [ -z "$os_type" ] || [ -z "$os_version" ]; then
+    echo "Usage: $0 <dev|almalinux|ubuntu|fedora> <version>" >&2
+    exit 2
+fi
+
  # Run builds in Container
 
 if [ "$os_type" = "dev" ]; then
-	
-	# sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" -v /awips2/repo/${dn}:/awips2/repo/${dn} $imgname:$imgvers-$os_version
-        sudo docker run -v `pwd`:/gempak:rw unidata/gempak-devel:centos6 /bin/bash -c "bash -xe /gempak/build/build_dev.sh"
 
-elif [ "$os_type" = "centos" ]; then
+    # sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" -v /awips2/repo/${dn}:/awips2/repo/${dn} $imgname:$imgvers-$os_version
+    sudo docker run -v `pwd`:/gempak:rw unidata/gempak-devel:centos6 /bin/bash -c "bash -xe /gempak/build/build_dev.sh"
+
+elif [ "$os_type" = "almalinux" ]; then
 
-        sudo docker run --privileged -d -ti -e "container=docker" -v `pwd`:/gempak:rw quay.io/centos/centos:$os_version /bin/bash
-        DOCKER_CONTAINER_ID=$(sudo docker ps | grep ${os_version} | awk '{print $1}' | head -1 )
+    CONTAINER_IMAGE=quay.io/almalinuxorg/${os_version}-base
+    BUILD_SCRIPT=build_almalinux.sh
+
+    DOCKER_CONTAINER_ID=$(sudo docker run --privileged -d -ti -e "container=docker" -v `pwd`:/gempak:rw $CONTAINER_IMAGE /bin/bash)
         sudo docker logs $DOCKER_CONTAINER_ID
-        sudo docker exec --tty $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /gempak/build/build_${os_type}.sh ${os_version}";
+        sudo docker exec --tty $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /gempak/build/${BUILD_SCRIPT} ${os_version}";
         sudo docker ps -a
         sudo docker stop $DOCKER_CONTAINER_ID
         sudo docker rm -v $DOCKER_CONTAINER_ID
 
 elif [ "$os_type" = "ubuntu" ]; then
 
-    sudo docker run --rm=true -v `pwd`:/gempak:rw unidata/gempak-devel:$os_type /bin/bash -c "bash -xe /gempak/build/build_${os_type}.sh "
+    sudo docker run --rm=true -v `pwd`:/gempak:rw ubuntu:${os_version} /bin/bash -c "bash -xe /gempak/build/build_${os_type}.sh "
 
 elif [ "$os_type" = "fedora" ]; then
 
     sudo docker run --rm=true -v `pwd`:/gempak:rw unidata/gempak-devel:$os_type /bin/bash -c "bash -xe /gempak/build/build_${os_type}.sh"
 
+else
+
+    echo "Unsupported os_type '$os_type'. Expected one of: dev, almalinux, ubuntu, fedora." >&2
+    exit 2
+
 fi