From 3d501fe953d8995e02e0780fea1997308d139981 Mon Sep 17 00:00:00 2001 From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com> Date: Thu, 19 Mar 2026 19:32:28 +0000 Subject: [PATCH 1/3] remove RPM generation from top-level bes root --- .travis.yml | 42 --- INSTALL | 28 -- Makefile.am | 18 -- bes.spec.all_static.in | 300 ------------------ bes.spec.in | 269 ---------------- .../dmrpp_module/build_dmrpp_h4/get_dmrpp_h4 | 2 +- modules/dmrpp_module/get_dmrpp/get_dmrpp_h5 | 2 +- travis/build-rh8-rpm-debug.sh | 47 --- travis/build-rh8-rpm.sh | 105 ------ travis/build-rh9-rpm.sh | 124 -------- travis/rpm-to-package-dir.sh | 27 -- 11 files changed, 2 insertions(+), 962 deletions(-) delete mode 100644 bes.spec.all_static.in delete mode 100644 bes.spec.in delete mode 100644 travis/build-rh8-rpm-debug.sh delete mode 100755 travis/build-rh8-rpm.sh delete mode 100755 travis/build-rh9-rpm.sh delete mode 100755 travis/rpm-to-package-dir.sh diff --git a/.travis.yml b/.travis.yml index babf1073a0..f6cc3f5e97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -130,7 +130,6 @@ before_script: stages: - name: build-and-test - - name: build-rpms - name: build-docker - name: scan if: branch = master @@ -176,43 +175,6 @@ jobs: - mv bes-*.tar.gz bes-$SOURCE_VERSION.tar.gz - cp bes-$SOURCE_VERSION.tar.gz bes-snapshot.tar.gz - - stage: build-rpms - name: "Enterprise Linux 8 RPMs (via Rocky8)" - script: - - export BES_BUILD=rocky8 - - mkdir -p $prefix/rpmbuild - - echo "branch name ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" - - docker run - --env prefix=/root/install - --volume $prefix/rpmbuild:/root/rpmbuild - --volume $TRAVIS_BUILD_DIR:/root/travis - --env GDAL_OPTION="$GDAL_OPTION" - --env OS=rocky8 - --env DIST=el8 - --env LIBDAP_RPM_VERSION=$LIBDAP_RPM_VERSION - --env BES_BUILD_NUMBER=$BES_BUILD_NUMBER - --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY - opendap/rocky8_hyrax_builder:latest /root/travis/travis/build-rh8-rpm.sh - - - stage: build-rpms - name: "Enterprise Linux 9 RPMs (via Rocky9)" - script: - - export BES_BUILD=rocky9 - - mkdir -p $prefix/rpmbuild - - echo "branch name ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" - - docker run - --env prefix=/root/install - --volume $prefix/rpmbuild:/root/rpmbuild - --volume $TRAVIS_BUILD_DIR:/root/bes - --env GDAL_OPTION="$GDAL_OPTION" - --env DIST="el9" - --env LIBDAP_RPM_VERSION="$LIBDAP_RPM_VERSION" - --env BES_BUILD_NUMBER="$BES_BUILD_NUMBER" - --env AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" - --env AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" - opendap/rocky9_hyrax_builder:latest /root/bes/travis/build-rh9-rpm.sh - - stage: build-docker name: "Build docker image bes_core:-el8" script: @@ -316,10 +278,6 @@ before_deploy: - mkdir -p $TRAVIS_BUILD_DIR/package; # Source distribution prep (copies both the 'version' and 'snapshot') - if test "$BES_BUILD" = "srcdist"; then cp bes-*.tar.gz $TRAVIS_BUILD_DIR/package; fi - # Rocky8 distribution prep - - if test "$BES_BUILD" = "rocky8"; then ./travis/rpm-to-package-dir.sh "el8"; fi - # Rocky9 distribution prep - - if test "$BES_BUILD" = "rocky9"; then ./travis/rpm-to-package-dir.sh "el9"; fi # Check for the stuff... - ls -l $TRAVIS_BUILD_DIR/package diff --git a/INSTALL b/INSTALL index 910552f8f8..e5989c7852 100644 --- a/INSTALL +++ b/INSTALL @@ -7,7 +7,6 @@ Building and Installing the BES BUILDING FROM A GIT CLONE BUILDING FROM A SOURCE DISTRIBUTION -BUILDING AN RPM RUNNING DISTCHECK BUILD REQUIREMENTS NOTES @@ -70,22 +69,6 @@ recommend that you install cppunit if you have not already. 3. Type `make install' to install the BES software. The package installs in /usr/local/ by default; use --prefix to change that. -BUILDING AN RPM - -There are several targets in the BES Makefile that can be used to build -RPM packages. The target 'rpm' will assume you want to use the bes.spec -file and build an RPM for either the bes alone or bes w/modules (depending -on the file that configure.ac is linked to). In the latter case, only -modules with dependencies that are installed using RPM will be built. - -The BES Makefile also has another set of targets that are intended for -use with a BES + modules build and will build _all_ of the modules, using -static linkage for the one that don't have their dependencies provided by -an RPM. To build this kind of RPM, you need to first get and build the -hyrax-dependencies package and do so using one of the special targets in its -Makefile for 'static-rpms'. You will also need to force it to build only -static libraries using CONFIGURE_FLAGS=--disable-shared when you rum 'make'. - RUNNING DISTCHECK If you've used the hyrax-dependencies package to build the BES + modules, @@ -181,17 +164,6 @@ NOTES information it needs. Only developers working on libdap should ever have to do this. - o To build a rpm file for a source or binary distribution: 1) Use 'make - dist' to build a *.tar.gz file; 2) Copy that to ~/rpm/SOURCES, - and; 3) Run 'rpmbuild -ts ~/rpm/SOURCES/bes.*.tar.gz' to make the - source package. Use '-tb' to make the binary package. I use a - ~/.rpmmacros file that contains: - - %_topdir /home/jimg/rpm - %_tmppath /home/jimg/rpm/tmp - - Or, use the 'rpm' target in the Makefile. - o DEBUGGING AIDS - Debugging is built in to the BES and does not require any special diff --git a/Makefile.am b/Makefile.am index 3338271037..7ebec00d22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,24 +114,6 @@ dist-hook: -rm -rf `find $(distdir) -name '*.spec' -a ! -name bes.spec ` -rm -rf `find $(distdir) -name 'test_config.h' ` -# Build linux RPMs - -srpm: dist - rpmbuild -ts --clean $(RPM_OPTIONS) @PACKAGE@-@PACKAGE_VERSION@.tar.gz - -# NB: 'dist' builds a tar.gz package using automake in the CWD. -rpm: dist - cp @PACKAGE@-@VERSION@.tar.gz ~/rpmbuild/SOURCES - rpmbuild -bb --clean $(RPM_OPTIONS) bes.spec - -# This target is pretty specific to our need to build a RPM for use at -# NASA DAACs. We are assuming that the user has the rpmbuild dirs. -# This will link with everything it can find in the local deps dir, -# removing the need for EPEL -all-static-rpm: dist - cp @PACKAGE@-@VERSION@.tar.gz ~/rpmbuild/SOURCES - rpmbuild -bb $(RPM_OPTIONS) bes.spec.all_static - .PHONY: clion-source-discovery clion-source-discovery: -$(MAKE) $(MFLAGS) diff --git a/bes.spec.all_static.in b/bes.spec.all_static.in deleted file mode 100644 index 720e72d921..0000000000 --- a/bes.spec.all_static.in +++ /dev/null @@ -1,300 +0,0 @@ -# -*- mode: rpm-spec -*- - -%define bescachedir %{_localstatedir}/cache/%{name} -%define bespkidir %{_sysconfdir}/pki/%{name} -%define beslogdir %{_localstatedir}/log/%{name} -%define bespiddir %{_localstatedir}/run -# The pid file should be in /var/run and not /var/run/bes for systemctl/systemd -# to function correctly (it could be hacked, but it's better to go with the herd). -# jhrg 1/31/19 -# /%{name} -%define besuser %{name} -%define besgroup %{name} -%define beslibdir %{_libdir}/bes -%define bessharedir %{_datadir}/bes -%define hyraxsharedir %{_datadir}/hyrax - -Name: bes -Version: @PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_PATCH_VERSION@ -Release: @PACKAGE_BUILD_NUMBER@.static%{?dist} -Summary: Back-end server software framework for OPeNDAP - -Group: System Environment/Libraries -License: LGPLv2+ -URL: http://www.opendap.org/download/BES.html -Source0: http://www.opendap.org/pub/source/bes-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires: libdap >= 3.21.1 -Requires: readline bzip2 zlib -Requires: libicu >= 3.6 -Requires: libxml2 >= 2.9.0 -Requires: libcurl >= 7.61.0 -Requires: openssl - -# Requires: netcdf >= 4.1 -# Requires: hdf5 => 1.8 -# Build and run against a static hdf4/hdfeos2 library because hdfeos2 -# is not part of the RPM ecosystem. jhrg 3/24/15 -# Requires: hdf >= 4.2 -# gdal >= 3.2.1 -# gridfields >= ? -# fits >= ? - -Requires(pre): shadow-utils - -BuildRequires: libdap-devel >= 3.21.1 -BuildRequires: readline-devel -BuildRequires: bzip2-devel zlib-devel -BuildRequires: libxml2-devel >= 2.9.0 -BuildRequires: libcurl-devel >= 7.61.0 -BuildRequires: libicu-devel >= 3.6 -BuildRequires: openssl-devel -BuildRequires: pkgconfig - -# RH7++ only -BuildRequires: systemd - -%description -BES is a high-performance back-end server software framework for -OPeNDAP that allows data providers more flexibility in providing end -users views of their data. The current OPeNDAP data objects (DAS, DDS, -and DataDDS) are still supported, but now data providers can add new data -views, provide new functionality, and new features to their end users -through the BES modular design. Providers can add new data handlers, new -data objects/views, the ability to define views with constraints and -aggregation, the ability to add reporting mechanisms, initialization -hooks, and more. Note: This RPM contains versions of the runtime -modules (aka handlers) that are statically linked to any dependencies -that cannot be pulled from the RHEL/CentOS 6 yum repositories. The -RPM without 'static' in its name requires that the EPEL repo be used -for some dependencies and does not include modules that lack dependencies -in the standard + EPEL repos. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.21.1 -# for the /usr/share/aclocal directory ownership -Requires: automake -Requires: openssl-devel, bzip2-devel, zlib-devel -Requires: pkgconfig - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - -# %package doc -# Summary: Documentation of the OPeNDAP BES -# Group: Documentation - -# %description doc -# Documentation of OPeNDAP BES. - -%prep -%setup -q -chmod a-x dispatch/BESStreamResponseHandler* - -%build -%configure --disable-dependency-tracking --with-dependencies=$prefix/deps $GDAL_OPTION --with-build=@PACKAGE_BUILD_NUMBER@ -# Try removing --disable-static from the above so that libdap_module.a is built. -# The code links with this to avoid linking to a Shared Object library that is -# really a run-time loaded module. jhrg 1/21/22 -make %{?_smp_mflags} - -# make docs -# rm -rf __distribution_docs -# cp -pr docs __distribution_docs -# mv __distribution_docs/html __distribution_docs/api-html -# # .map and .md5 files are of dubious use -# rm __distribution_docs/api-html/*.map -# rm __distribution_docs/api-html/*.md5 -# chmod a-x __distribution_docs/BES_*.doc - -sed -i.dist -e 's:=/tmp:=%{bescachedir}:' \ - -e 's:=.*/bes.log:=%{beslogdir}/bes.log:' \ - -e 's:=.*/lib/bes:=%{beslibdir}:' \ - -e 's:=.*/share/bes:=%{bessharedir}:' \ - -e 's:=.*/share/hyrax:=%{hyraxsharedir}:' \ - -e 's:=/full/path/to/serverside/certificate/file.pem:=%{bespkidir}/cacerts/file.pem:' \ - -e 's:=/full/path/to/serverside/key/file.pem:=%{bespkidir}/public/file.pem:' \ - -e 's:=/full/path/to/clientside/certificate/file.pem:=%{bespkidir}/cacerts/file.pem:' \ - -e 's:=/full/path/to/clientside/key/file.pem:=%{bespkidir}/public/file.pem:' \ - -e 's:=user_name:=%{besuser}:' \ - -e 's:=group_name:=%{besgroup}:' \ - dispatch/bes/bes.conf - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -# Static libraries are now built so the code can link against libdap_module.a in -# some special cases. But, those should not be part of the RPM package so remove -# them here (along with the libtool archives). jhrg 1/21/22 -find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' -mkdir -p $RPM_BUILD_ROOT%{bescachedir} -chmod g+w $RPM_BUILD_ROOT%{bescachedir} -mkdir -p $RPM_BUILD_ROOT%{bespkidir}/{cacerts,public} -mkdir -p $RPM_BUILD_ROOT%{beslogdir} -chmod g+w $RPM_BUILD_ROOT%{beslogdir} -mkdir -p $RPM_BUILD_ROOT%{bespiddir} -chmod g+w $RPM_BUILD_ROOT%{bespiddir} -mv $RPM_BUILD_ROOT%{_bindir}/bes-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/bes-config -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} -mv $RPM_BUILD_ROOT%{_bindir}/bes-tmpfiles-conf $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre -getent group %{besgroup} >/dev/null || groupadd -r %{besgroup} -getent passwd %{besuser} >/dev/null || \ -useradd -r -g %{besuser} -d %{beslogdir} -s /sbin/nologin \ - -c "BES daemon" %{besuser} -exit 0 - -%post -/sbin/chkconfig --add besd -/sbin/ldconfig - -%preun -/sbin/chkconfig --del besd - -%postun -p /sbin/ldconfig - -%files - -#%attr(, , ) file -#%defattr(file perms, user, group, dir perms) - -%defattr(-,root,root,-) -%doc ChangeLog NEWS README.md -# NB: listing a directory here packages the dir and everything it contains. Using %dir -# packages _just_ the dir. Subsequent commands can add contents selectively. jhrg 9/19/18 -%dir %{_sysconfdir}/bes/ -%dir %{_sysconfdir}/bes/modules - -%config(noreplace) %{_sysconfdir}/bes/bes.conf -%config(noreplace) %{_sysconfdir}/bes/site.conf.proto -%config(noreplace) %{_sysconfdir}/bes/modules/*.conf - -# Added 10/25/16 jhrg. See below for the installation of the logrotate file. -%dir %{_sysconfdir}/logrotate.d -%config(noreplace) %{_sysconfdir}/logrotate.d/besd.logrotate - -%dir %{_datadir}/bes/ -%{_datadir}/bes/*.html -%{_datadir}/bes/*.txt -%{_datadir}/bes/*.xml - -%{_datadir}/hyrax/ - -%{_datadir}/mds/ - -%{_bindir}/beslistener -%{_bindir}/besdaemon -# %{_bindir}/besd # moved to /etc/rc.d/init.d; see below. -%{_bindir}/besstandalone -%{_bindir}/besctl -%{_bindir}/hyraxctl -%{_bindir}/bescmdln -%{_bindir}/build_dmrpp -%{_bindir}/build_dmrpp_h4 -%{_bindir}/check_dmrpp -%{_bindir}/merge_dmrpp -%{_bindir}/reduce_mdf -# %{_bindir}/ngap_build_dmrpp -%{_bindir}/localBesGetDap -%{_bindir}/populateMDS -%{_bindir}/get_dmrpp -%{_bindir}/get_dmrpp_h4 -%{_bindir}/get_dmrpp_h5 -%{_bindir}/ingest_filesystem -%{_bindir}/ingest_s3bucket -%{_bindir}/gen_dmrpp_side_car -%{_bindir}/get_hdf_side_car -%{_bindir}/beslog2json.py - -#%{_bindir}/retriever -# There is now a separate project for a new build_sidecar program. This should not -# be installed. jhrg 8/20/20 -# %{_bindir}/build_sidecar - -%{_libdir}/*.so.* -%{_libdir}/bes/ - -%{_initddir}/besd - -# %{bescachedir} -%{bespkidir}/ - -%attr (-,%{besuser},%{besgroup}) %{beslogdir} -# The directory bespiddir was specific to the bes, but it became a system directory. -# Thus, its bad form to change the owner and group to the 'bes.' jhrg 7/8/20 -# %attr (-,%{besuser},%{besgroup}) %{bespiddir} -%attr (-,%{besuser},%{besgroup}) %{bescachedir} - -# Make sure that the BES, once running, can write to the MDS directory. jhrg 11/7/18 -%attr (-,%{besuser},%{besgroup}) %{_datadir}/mds/ - -%{_tmpfilesdir}/%{name}.conf - -%files devel -%defattr(-,root,root,-) -# %doc __distribution_docs/BES_*.doc -%{_bindir}/besCreateModule -%{_bindir}/bes-config -%{_includedir}/bes/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/bes_*.pc -%{_datadir}/bes/templates/ -%{_datadir}/aclocal/bes.m4 - -# %files doc -# %defattr(-,root,root,-) -# %doc __distribution_docs/api-html/ - -%changelog -* Wed Mar 18 2020 Nathan Potter -3.20.6-1 -- Added ngap_build_dmrpp to bin - -* Thu Aug 30 2018 James Gallagher - 3.19.1-1.static -- Added build_dmrpp, localBesGetDap, and populateMDS to bin - -* Thu Apr 2 2015 EC2 James Gallagher - 3.13.2-1.NASA -- Added install of 'besd' script to /etc/rc.d/init.d - -* Tue Sep 14 2010 Patrick West - 3.9.0-1 -- Update - -* Tue May 04 2010 Patrick West - 3.8.3-1 -- Update - -* Tue Apr 06 2010 Patrick West - 3.8.2-1 -- Update - -* Thu Mar 11 2010 Patrick West - 3.8.1-1 -- Update - -* Tue Feb 02 2010 Patrick West - 3.8.0-1 -- Update - -* Thu Jan 29 2009 James Gallagher - 3.7.0-1 -- Update - -* Wed Jun 25 2008 Patrick West 3.6.2-1 -- Update. - -* Fri Apr 11 2008 Patrick West 3.6.1-1 -- Update. - -* Fri Feb 29 2008 Patrick West 3.6.0-1 -- Update. - -* Tue Feb 13 2007 James Gallagher 3.4.0-1 -- Update. - -* Sat Jul 22 2006 Patrice Dumas 3.2.0-1 -- initial packaging diff --git a/bes.spec.in b/bes.spec.in deleted file mode 100644 index f9cf132621..0000000000 --- a/bes.spec.in +++ /dev/null @@ -1,269 +0,0 @@ - -%define bescachedir %{_localstatedir}/cache/%{name} -%define bespkidir %{_sysconfdir}/pki/%{name} -%define beslogdir %{_localstatedir}/log/%{name} -%define bespiddir %{_localstatedir}/run -%define besuser %{name} -%define besgroup %{name} -%define beslibdir %{_libdir}/bes -%define bessharedir %{_datadir}/bes -%define hyraxsharedir %{_datadir}/hyrax - -Name: bes -Version: @PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_PATCH_VERSION@ -Release: @PACKAGE_BUILD_NUMBER@%{?dist} -Summary: Back-end server software framework for OPeNDAP - -Group: System Environment/Libraries -License: LGPLv2+ -URL: http://www.opendap.org/download/BES.html -Source0: http://www.opendap.org/pub/source/bes-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Requires: libdap >= 3.21.1 -Requires: readline bzip2 zlib -Requires: netcdf >= 4.8 -Requires: libicu >= 3.6 -Requires: hdf5 >= 1.10.5 -Requires: hdf >= 4.2 -Requires: libxml2 >= 2.9.0 -Requires: libcurl >= 7.61.0 -Requires: openssl - -Requires(pre): shadow-utils - -BuildRequires: libdap-devel >= 3.21.1 -BuildRequires: readline-devel -BuildRequires: bzip2-devel zlib-devel -BuildRequires: libxml2-devel >= 2.9.0 -BuildRequires: libcurl-devel >= 7.61.0 -BuildRequires: netcdf-devel >= 4.8 -BuildRequires: libicu-devel >= 3.6 -BuildRequires: hdf5-devel >= 1.10.5 -BuildRequires: hdf-devel >= 4.2 -BuildRequires: openssl-devel -BuildRequires: pkgconfig - -%description -BES is a high-performance back-end server software framework for -OPeNDAP that allows data providers more flexibility in providing end -users views of their data. The current OPeNDAP data objects (DAS, DDS, -and DataDDS) are still supported, but now data providers can add new data -views, provide new functionality, and new features to their end users -through the BES modular design. Providers can add new data handlers, new -data objects/views, the ability to define views with constraints and -aggregation, the ability to add reporting mechanisms, initialization -hooks, and more. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.21.1 -# for the /usr/share/aclocal directory ownership -Requires: automake -Requires: openssl-devel, bzip2-devel, zlib-devel -Requires: pkgconfig - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - -# %package doc -# Summary: Documentation of the OPeNDAP BES -# Group: Documentation - -# %description doc -# Documentation of OPeNDAP BES. - -%prep -%setup -q -chmod a-x dispatch/BESStreamResponseHandler* - -%build -%configure --disable-static --disable-dependency-tracking --with-build=@PACKAGE_BUILD_NUMBER@ -make %{?_smp_mflags} - -# make docs -# rm -rf __distribution_docs -# cp -pr docs __distribution_docs -# mv __distribution_docs/html __distribution_docs/api-html -# # .map and .md5 files are of dubious use -# rm __distribution_docs/api-html/*.map -# rm __distribution_docs/api-html/*.md5 -# chmod a-x __distribution_docs/BES_*.doc - -sed -i.dist -e 's:=/tmp:=%{bescachedir}:' \ - -e 's:=.*/bes.log:=%{beslogdir}/bes.log:' \ - -e 's:=.*/lib/bes:=%{beslibdir}:' \ - -e 's:=.*/share/bes:=%{bessharedir}:' \ - -e 's:=.*/share/hyrax:=%{hyraxsharedir}:' \ - -e 's:=/full/path/to/serverside/certificate/file.pem:=%{bespkidir}/cacerts/file.pem:' \ - -e 's:=/full/path/to/serverside/key/file.pem:=%{bespkidir}/public/file.pem:' \ - -e 's:=/full/path/to/clientside/certificate/file.pem:=%{bespkidir}/cacerts/file.pem:' \ - -e 's:=/full/path/to/clientside/key/file.pem:=%{bespkidir}/public/file.pem:' \ - -e 's:=user_name:=%{besuser}:' \ - -e 's:=group_name:=%{besgroup}:' \ - dispatch/bes/bes.conf - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -mkdir -p $RPM_BUILD_ROOT%{bescachedir} -chmod g+w $RPM_BUILD_ROOT%{bescachedir} -mkdir -p $RPM_BUILD_ROOT%{bespkidir}/{cacerts,public} -mkdir -p $RPM_BUILD_ROOT%{beslogdir} -chmod g+w $RPM_BUILD_ROOT%{beslogdir} -mkdir -p $RPM_BUILD_ROOT%{bespiddir} -chmod g+w $RPM_BUILD_ROOT%{bespiddir} -mv $RPM_BUILD_ROOT%{_bindir}/bes-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/bes-config -mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} -mv $RPM_BUILD_ROOT%{_bindir}/bes-tmpfiles-conf $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre -getent group %{besgroup} >/dev/null || groupadd -r %{besgroup} -getent passwd %{besuser} >/dev/null || \ -useradd -r -g %{besuser} -d %{beslogdir} -s /sbin/nologin \ - -c "BES daemon" %{besuser} -exit 0 - -%post -/sbin/chkconfig --add besd -/sbin/ldconfig - -%preun -/sbin/chkconfig --del besd - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc ChangeLog NEWS README.md -%dir %{_sysconfdir}/bes/ -%dir %{_sysconfdir}/bes/modules - -%{_tmpfilesdir}/%{name}.conf - -%config(noreplace) %{_sysconfdir}/bes/bes.conf -%config(noreplace) %{_sysconfdir}/bes/site.conf.proto -%config(noreplace) %{_sysconfdir}/bes/modules/*.conf - -# Added 10/25/16 jhrg. See below for the installation of the logrotate file. -# %dir %{_sysconfdir}/logrotate.d -# %config(noreplace) %{_sysconfdir}/logrotate.d/besd.logrotate - -%dir %{_datadir}/bes/ -%{_datadir}/bes/*.html -%{_datadir}/bes/*.txt -%{_datadir}/bes/*.xml - -%{_datadir}/hyrax/ - -%{_datadir}/mds/ - -%{_bindir}/beslistener -%{_bindir}/besdaemon -# %{_bindir}/besd # moved to /etc/rc.d/init.d; see below. -%{_bindir}/besstandalone -%{_bindir}/besctl -%{_bindir}/hyraxctl -%{_bindir}/bescmdln -%{_bindir}/build_dmrpp -%{_bindir}/build_dmrpp_h4 -%{_bindir}/check_dmrpp -%{_bindir}/merge_dmrpp -%{_bindir}/reduce_mdf -#%{_bindir}/ngap_build_dmrpp -%{_bindir}/localBesGetDap -%{_bindir}/populateMDS -%{_bindir}/get_dmrpp -%{_bindir}/get_dmrpp_h4 -%{_bindir}/get_dmrpp_h5 -%{_bindir}/ingest_filesystem -%{_bindir}/ingest_s3bucket -%{_bindir}/gen_dmrpp_side_car -%{_bindir}/get_hdf_side_car -%{_bindir}/retriever -%{_bindir}/beslog2json.py -# TODO Change build_sidecar to a better name, like build_stare_sidecar. jhrg 10/29/19 -%{_bindir}/build_sidecar - -%{_libdir}/*.so.* -%{_libdir}/bes/ - -%{_initddir}/besd - -# %{bescachedir} -%{bespkidir}/ - -%attr (-,%{besuser},%{besgroup}) %{beslogdir} -# The directory bespiddir was specific to the bes, but it became a system directory. -# Thus, its bad form to change the owner and group to the 'bes.' jhrg 7/8/20 -# %attr (-,%{besuser},%{besgroup}) %{bespiddir} -%attr (-,%{besuser},%{besgroup}) %{bescachedir} - -# Make sure that the BES, once running, can write to the MDS directory. jhrg 11/7/18 -%attr (-,%{besuser},%{besgroup}) %{_datadir}/mds/ - -%files devel -%defattr(-,root,root,-) -# %doc __distribution_docs/BES_*.doc -%{_bindir}/besCreateModule -%{_bindir}/bes-config -%{_includedir}/bes/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/bes_*.pc -%{_datadir}/bes/templates/ -%{_datadir}/aclocal/bes.m4 - -# %files doc -# %defattr(-,root,root,-) -# %doc __distribution_docs/api-html/ - -%changelog -* Wed Mar 18 2020 Nathan Potter -3.20.6-1 -- Added ngap_build_dmrpp to bin - -* Thu Aug 30 2018 James Gallagher - 3.19.1-1 -- Added build_dmrpp, localBesGetDap, and populateMDS to bin - -* Thu Apr 2 2015 EC2 James Gallagher - 3.13.2-1 -- Added install of 'besd' script to /etc/rc.d/init.d - -* Tue Sep 14 2010 Patrick West - 3.9.0-1 -- Update - -* Tue May 04 2010 Patrick West - 3.8.3-1 -- Update - -* Tue Apr 06 2010 Patrick West - 3.8.2-1 -- Update - -* Thu Mar 11 2010 Patrick West - 3.8.1-1 -- Update - -* Tue Feb 02 2010 Patrick West - 3.8.0-1 -- Update - -* Thu Jan 29 2009 James Gallagher - 3.7.0-1 -- Update - -* Wed Jun 25 2008 Patrick West 3.6.2-1 -- Update. - -* Fri Apr 11 2008 Patrick West 3.6.1-1 -- Update. - -* Fri Feb 29 2008 Patrick West 3.6.0-1 -- Update. - -* Tue Feb 13 2007 James Gallagher 3.4.0-1 -- Update. - -* Sat Jul 22 2006 Patrice Dumas 3.2.0-1 -- initial packaging diff --git a/modules/dmrpp_module/build_dmrpp_h4/get_dmrpp_h4 b/modules/dmrpp_module/build_dmrpp_h4/get_dmrpp_h4 index 697cceff16..e5068a8f36 100755 --- a/modules/dmrpp_module/build_dmrpp_h4/get_dmrpp_h4 +++ b/modules/dmrpp_module/build_dmrpp_h4/get_dmrpp_h4 @@ -295,7 +295,7 @@ if (args.verbosity is True): By default, a temporary BES configuration file will be created to use for generation of the dmr. It will be deleted before the end of this program. If the default way does not work for you, you can try the -s option to let the program check if it can use the BES configuration file provided by the system. - To use this option, the file name bes.conf will be searched to see if it is under /etc/bes, this is the common place for the rpm installation. + To use this option, the file name bes.conf will be searched to see if it is under /etc/bes, this is the common place for the installation. If still not found, it will search this file according to the path of besstandalone. The HDF4 file should be provided somewhere under the directory specified by BES.Catalog.catalog.RootDirectory inside the bes configuration file. diff --git a/modules/dmrpp_module/get_dmrpp/get_dmrpp_h5 b/modules/dmrpp_module/get_dmrpp/get_dmrpp_h5 index 248e571e12..e2e338e4eb 100755 --- a/modules/dmrpp_module/get_dmrpp/get_dmrpp_h5 +++ b/modules/dmrpp_module/get_dmrpp/get_dmrpp_h5 @@ -300,7 +300,7 @@ if (args.verbosity is True): By default, a temporary BES configuration file will be created to use for generation of the dmr. It will be deleted before the end of this program. One can use -C option to generate the dmr file by using the EnableCF option in the HDF5 handler. If the default way does not work for you, you can try the -s option to let the program check if it can use the BES configuration file provided by the system. - To use this option, the file name bes.conf will be searched to see if it is under /etc/bes, this is the common place for the rpm installation. + To use this option, the file name bes.conf will be searched to see if it is under /etc/bes, this is the common place for the installation. If still not found, it will search this file according to the path of besstandalone. The HDF5 file should be provided somewhere under the directory specified by BES.Catalog.catalog.RootDirectory inside the bes configuration file. diff --git a/travis/build-rh8-rpm-debug.sh b/travis/build-rh8-rpm-debug.sh deleted file mode 100644 index 8ba380c85e..0000000000 --- a/travis/build-rh8-rpm-debug.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# -# This script is used to debug the RPM build process using a docker container. -# It mirrors the way the RPM build is done using Travis, as closely as possible -# on a local machine. jhrg 6/7/24 - -# This is how Travis builds the RHEL 8 RPMs: -# -# - export BES_BUILD=rocky8 -# - mkdir -p $prefix/rpmbuild -# - echo "branch name ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" -# - docker run --env prefix=/root/install --volume $prefix/rpmbuild:/root/rpmbuild -# --volume $TRAVIS_BUILD_DIR:/root/travis -# --env OS=rocky8 -# --env DIST=el8 -# --env LIBDAP_RPM_VERSION=$LIBDAP_RPM_VERSION -# --env BES_BUILD_NUMBER=$BES_BUILD_NUMBER -# --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -# --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -# opendap/rocky8_hyrax_builder:latest /root/travis/travis/build-rh8-rpm.sh - -# I used the keys that are bound to the travis-bes user, but any keys that can -# read from the opendap.travis.build S3 bucket should work. - -if printenv prefix >/dev/null 2>&1; then echo "Prefix: $prefix"; else echo "Env Var prefix not defined"; exit; fi -if printenv AWS_ACCESS_KEY_ID >/dev/null 2>&1; then echo "AWS_ACCESS_KEY_ID: X"; else echo "AWS_ACCESS_KEY_ID not defined"; exit; fi -if printenv AWS_SECRET_ACCESS_KEY >/dev/null 2>&1; then echo "AWS_SECRET_ACCESS_KEY: X"; else echo "AWS_SECRET_ACCESS_KEY not defined"; exit; fi - -# Get these from the path to the repo and $BES_SRC_DIR/libdap4-snapshot -export BES_SRC_DIR=/Users/jgallag4/src/hyrax/bes -export LIBDAP_RPM_VERSION=3.21.0-70 - -export BES_BUILD_NUMBER=0 - -mkdir -p $prefix/rpmbuild - -docker run -it --volume $prefix/rpmbuild:/root/rpmbuild \ - --volume $BES_SRC_DIR:/root/travis \ - --env prefix=/root/install \ - --env OS=rocky8 \ - --env DIST=el8 \ - --env LIBDAP_RPM_VERSION=$LIBDAP_RPM_VERSION \ - --env BES_BUILD_NUMBER=$BES_BUILD_NUMBER \ - --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \ - --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \ - opendap/rocky8_hyrax_builder:latest /root/travis/travis/build-rh8-rpm.sh - diff --git a/travis/build-rh8-rpm.sh b/travis/build-rh8-rpm.sh deleted file mode 100755 index 4c48f42acb..0000000000 --- a/travis/build-rh8-rpm.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# -# This is part of the Travis build CD process. It is intended to be -# run from within the Travis build process and depends on the settings -# in the BES's .travis.yml file. However, it is run _inside a Docker -# container_ using values passed in by the .travis.yml file -# -# The env vars $HOME, $OS, $DIST AND $LIBDAP_RPM_VERSION must be set. -# -# run the script like this: -# docker run -# -e OS=rocky8 -# -e DIST=el8 -# -e LIBDAP_RPM_VERSION='3.20.0-1' -# -v $prefix/el8/rpmbuild:/root/rpmbuild -# -v `pwd`:/root/travis -# opendap/rocky8_hyrax_builder:latest /root/travis/travis/build-rh8-rpm.sh -# -# e: exit immediately on non-zero exit value from a command -# u: treat unset env vars in substitutions as an error -set -eux - -# Formatted output shenanigans... -HR="#########################################################################" -########################################################################### -# loggy() -function loggy(){ - echo "$@" | awk '{ print "# "$0;}' >&2 -} - -yum update -y - -# This script will start with /root as the CWD since that's how the -# centos6/7 hyrax build containers are configured. The PATH will be -# set to include $prefix/bin and $prefix/deps/bin; $prefix will be -# $HOME/install. $HOME is /root for the build container. -loggy "$HR" -loggy "$0 BEGIN" -loggy "Running inside the docker container" -loggy " redhat-release: \"$(cat /etc/redhat-release)\"" -loggy " prefix: '$prefix'" -loggy " HOME: '$HOME'" -loggy " PATH: '$PATH'" -loggy " OS: '$OS'" -loggy " GDAL_OPTION: '$GDAL_OPTION'" -loggy " BES_BUILD_NUMBER: '$BES_BUILD_NUMBER'" -loggy " LIBDAP_RPM_VERSION: '$LIBDAP_RPM_VERSION'" - -DEPENDENCIES_BUNDLE="hyrax-dependencies-$OS-static.tar.gz" -loggy "DEPENDENCIES_BUNDLE: '$DEPENDENCIES_BUNDLE'" - -aws s3 cp "s3://opendap.travis.build/$DEPENDENCIES_BUNDLE" /tmp/ - -loggy "Dependencies: " -# This dumps the dependencies in $HOME/install/deps/{lib,bin,...} -# The Centos7 dependencies are tarred so they include /root for a reason -# that escapes me. For CentOS Stream8, we have to CD to /root before expanding -# the tar ball to get the dependencies in /root/install. jhrg 2/11/22 -if test -n $OS -a $OS = rocky8 -o $OS = centos-stream8 -then - tar -C /$HOME -xzvf "/tmp/$DEPENDENCIES_BUNDLE" -else - tar -xzvf "/tmp/$DEPENDENCIES_BUNDLE" -fi - -loggy "Dependencies Inventory:" -loggy "$(ls -lR $HOME/install/deps)" - -# Then get the libdap RPMs packages -# libdap-3.20.0-1.el6.x86_64.rpm libdap-devel-3.20.0-1.el6.x86_64.rpm -# $DIST is 'el6', 'el7', or 'el8'; $LIBDAP_RPM_VERSION is 3.20.0-1 (set by Travis) -aws s3 cp s3://opendap.travis.build/libdap-$LIBDAP_RPM_VERSION.$DIST.x86_64.rpm /tmp/ -aws s3 cp s3://opendap.travis.build/libdap-devel-$LIBDAP_RPM_VERSION.$DIST.x86_64.rpm /tmp/ - -yum install -y /tmp/*.rpm - -# cd to the $TRAVIS_BUILD_DIR directory. Note that we make $HOME/travis -# using the docker run --volume option and set it to $TRAVIS_BUILD_DIR. -cd $HOME/travis - -# The build needs these environment variables because CentOS 8 lacks the stock -# XDR/RPC libraries. Those were added to the docker image via the tirpc package. -# jhrg 2/11/22 -if test -n $OS -a $OS = rocky8 -o $OS = centos-stream8 -then - export CPPFLAGS=-I/usr/include/tirpc - export LDFLAGS=-ltirpc -fi - -autoreconf -fiv - -./configure --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps $GDAL_OPTION --with-build=$BES_BUILD_NUMBER - -# set up the rpm tree in $HOME. We didn't need to do this for libdap because -# rpmbuild took care of it, but for the BES, the Makefile copies the source -# tarball and thus, we have to make the rpm dir tree. Reading the Makefile.am -# will reveal more... -mkdir -pv $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} - -# This will leave the package in $HOME/rpmbuild/RPMS/x86_64/*.rpm -make -j16 all-static-rpm - -# Just a little reassurance... jhrg 3/23/21 -loggy "RPM Inventory:" -loggy "$(ls -l $HOME/rpmbuild/RPMS/x86_64/)" diff --git a/travis/build-rh9-rpm.sh b/travis/build-rh9-rpm.sh deleted file mode 100755 index f863045403..0000000000 --- a/travis/build-rh9-rpm.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# -# This is part of the Hyrax TravisCI/CD build process. It is intended to be -# run from within the TravisCI build process and depends on the settings -# in the BES's .travis.yml file. However, it is run _inside a Docker -# container_ using values passed in by the .travis.yml file -# -# Thesae environment variables must be set: -# - prefix -# - HOME -# - PATH -# - OS -# - DIST -# - GDAL_OPTION -# - BES_BUILD_NUMBER -# - LIBDAP_RPM_VERSION -# -# run the script like this: -# docker run --env prefix=/root/install --volume $prefix/rpmbuild:/root/rpmbuild -# --volume $TRAVIS_BUILD_DIR:/root/bes -# --env LIBDAP_RPM_VERSION=$LIBDAP_RPM_VERSION -# --env BES_BUILD_NUMBER=$BES_BUILD_NUMBER -# --env GDAL_OPTION=$GDAL_OPTION -# --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -# --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -# opendap/rocky9_hyrax_builder:latest /root/bes/travis/build-rh9-rpm.sh - -# e: exit immediately on non-zero exit value from a command -# u: treat unset env vars in substitutions as an error -set -eux - - -# Formatted output shenanigans... -HR="#########################################################################" -########################################################################### -# loggy() -function loggy(){ - echo "$@" | awk '{ print "# "$0;}' >&2 -} -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Defaults - -OS="${OS:-"rocky9"}" - -DIST="${DIST:-"el9"}" - -GDAL_OPTION="${GDAL_OPTION:-"--with-gdal"}" - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -loggy "$HR" -loggy "$0 BEGIN" -loggy "Running inside the docker container" -loggy " redhat-release: \"$(cat /etc/redhat-release)\"" -loggy " prefix: $prefix" -loggy " HOME: $HOME" -loggy " PATH: $PATH" -loggy " OS: $OS" -loggy " DIST: $DIST" -loggy " GDAL_OPTION: $GDAL_OPTION" -loggy " BES_BUILD_NUMBER: $BES_BUILD_NUMBER" -loggy "LIBDAP_RPM_VERSION: $LIBDAP_RPM_VERSION" - - - -loggy "Updating..." -yum update -y - -# This script will start with /root as the CWD since that's how the -# centos6/7 hyrax build containers are configured. The PATH will be -# set to include $prefix/bin and $prefix/deps/bin; $prefix will be -# $HOME/install. $HOME is /root for the build container. - -loggy "prefix: prefix" -loggy " HOME: $HOME" -loggy " PATH: $PATH" - -hyrax_deps_tarball="hyrax-dependencies-rocky9-static.tgz" - -# Get the pre-built dependencies (all static libraries). -loggy "Retrieving hyrax-dependencies for rocky9" -aws s3 cp "s3://opendap.travis.build/$hyrax_deps_tarball" /tmp/ - -# This dumps the dependencies in $HOME/install/deps/{lib,bin,...} -# The Centos7 dependencies are tarred so they include /root for a reason -# that escapes me. For CentOS Stream8, we have to CD to /root before expanding -# the tar ball to get the dependencies in /root/install. jhrg 2/11/22 -tar -C /$HOME -xzvf "/tmp/$hyrax_deps_tarball" - -ls -lR $HOME/install/deps - -# Then get the libdap RPMs packages -# libdap-3.20.0-1.el6.x86_64.rpm libdap-devel-3.20.0-1.el6.x86_64.rpm -# $DIST is 'el6', 'el7', or 'el8'; $LIBDAP_RPM_VERSION is 3.20.0-1 (set by Travis) -aws s3 cp s3://opendap.travis.build/libdap-$LIBDAP_RPM_VERSION.$DIST.x86_64.rpm /tmp/ -aws s3 cp s3://opendap.travis.build/libdap-devel-$LIBDAP_RPM_VERSION.$DIST.x86_64.rpm /tmp/ - -yum install -y /tmp/*.rpm - -# cd to the $TRAVIS_BUILD_DIR directory. Note that we make $HOME/travis -# using the docker run --volume option and set it to $TRAVIS_BUILD_DIR. -cd $HOME/bes - -# The build needs these environment variables because RHEL9. -# Those were added to the docker image via the tirpc package. -export CPPFLAGS=-I/usr/include/tirpc -export LDFLAGS=-ltirpc - -autoreconf -fiv - -echo "BES_BUILD_NUMBER: $BES_BUILD_NUMBER" -./configure --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps $GDAL_OPTION --with-build=$BES_BUILD_NUMBER - -# set up the rpm tree in $HOME. We didn't need to do this for libdap because -# rpmbuild took care of it, but for the BES, the Makefile copies the source -# tarball and thus, we have to make the rpm dir tree. Reading the Makefile.am -# will reveal more... -mkdir -pv $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} - -# This will leave the package in $HOME/rpmbuild/RPMS/x86_64/*.rpm -make -j16 all-static-rpm - -# Sanity check for human reassurance. -ls -l $HOME/rpmbuild/RPMS/x86_64/ diff --git a/travis/rpm-to-package-dir.sh b/travis/rpm-to-package-dir.sh deleted file mode 100755 index f15ff10010..0000000000 --- a/travis/rpm-to-package-dir.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# Part of the deployment process managed by Travis CI. This code copies RPM -# packages to a 'package' directory. It also duplicates them, making a set -# of RPMs labeled 'snapshot.' - -set -e - -# DIST should be one of el6 or el7. NB: We no longer make CentOS 6 packages -# but this will be useful when we are supporting both C7 and C8. jhrg 3/24/21 -DIST=${1} - -# 'prefix' and 'TRAVIS_BUILD_DIR' are in the environment - -# Copied the RPM files with version numbers. -cp ${prefix}/rpmbuild/RPMS/x86_64/* ${TRAVIS_BUILD_DIR}/package/ - -# Now make a second set of copies with 'snapshot' in place of the version -ver=`basename ${prefix}/rpmbuild/RPMS/x86_64/bes-[-0-9.]*.rpm | sed -e "s|bes-||g" -e "s|.static.${DIST}.x86_64.rpm||g"` -for file in ${prefix}/rpmbuild/RPMS/x86_64/* -do - echo "Updating BES ${DIST} snapshot with ${file}" - snap=`basename ${file} | sed "s|${ver}|snapshot|g"` - cp ${file} ${TRAVIS_BUILD_DIR}/package/${snap} -done - -exit 0 From f0247c2528dbc03fcd90c3e3e5e38a2de494f248 Mon Sep 17 00:00:00 2001 From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com> Date: Thu, 19 Mar 2026 19:33:09 +0000 Subject: [PATCH 2/3] remove stale github jobs --- .github/from_libdap4/asan.yml | 53 ----------- .github/from_libdap4/c7pkgbuild.yml | 62 ------------- .github/from_libdap4/distcheck.yml | 50 ----------- .github/from_libdap4/sonar-scan.yml | 62 ------------- .github/from_libdap4/src-distro-pkgbuild.yml | 45 ---------- .github/workflows/main.yml.never | 92 -------------------- 6 files changed, 364 deletions(-) delete mode 100644 .github/from_libdap4/asan.yml delete mode 100644 .github/from_libdap4/c7pkgbuild.yml delete mode 100644 .github/from_libdap4/distcheck.yml delete mode 100644 .github/from_libdap4/sonar-scan.yml delete mode 100644 .github/from_libdap4/src-distro-pkgbuild.yml delete mode 100644 .github/workflows/main.yml.never diff --git a/.github/from_libdap4/asan.yml b/.github/from_libdap4/asan.yml deleted file mode 100644 index 0cadd2aa02..0000000000 --- a/.github/from_libdap4/asan.yml +++ /dev/null @@ -1,53 +0,0 @@ -# This is the asan build stage from .travis.yml - -name: asan - -env: - prefix: ${{ github.workspace }}/build - jobs: 16 - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - ubuntu-build: - runs-on: ubuntu-16.04 - - steps: - - name: Packages - run: sudo apt-get --yes install libxml2-dev uuid-dev libcurl4-openssl-dev libcppunit-dev - - - name: cache-bison - id: cache-bison #id is required for the if below, not key - uses: actions/cache@v2 - with: - path: $prefix/deps - key: bison-${{ runner.os }} - - - name: build bison dependency - if: steps.cache-bison.outputs.cache-hit != 'true' - run: | - pwd - git clone https://github.com/OPENDAP/hyrax-dependencies - cd hyrax-dependencies - make --jobs=$jobs bison - - - name: checkout - uses: actions/checkout@v2 - - - name: autoreconf - run: autoreconf --force --install --verbose - - - name: configure - run: ./configure --prefix=$prefix --enable-developer --enable-asan - - - name: Make - run: make -j7 - - - name: Check - run: make -j7 check - \ No newline at end of file diff --git a/.github/from_libdap4/c7pkgbuild.yml b/.github/from_libdap4/c7pkgbuild.yml deleted file mode 100644 index d743e2fcc4..0000000000 --- a/.github/from_libdap4/c7pkgbuild.yml +++ /dev/null @@ -1,62 +0,0 @@ -# This is centOS 7 rpm build. - -name: centos7 rpm - -env: - prefix: ${{ github.workspace }}/build - jobs: 16 - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - centos-7-build: - runs-on: ubuntu-latest - container: - image: opendap/centos7_hyrax_builder:1.3 - - # packages step not here because the Docker container holds them already - steps: - - name: cache-bison - id: bison-centos7-docker # Used below in the 'if'. So i changed the id to match the if statement below - uses: actions/cache@v2 - with: - path: $prefix/deps - key: c7-pkg # changed the key to avoid conflict with the id. - - # build the dependencies so that we don't have to update the container - # every time the deps change. - - name: build bison dependency - # this statement should use the cache step id not the key - if: steps.bison-centos7-docker.outputs.cache-hit != 'true' - run: | - git clone https://github.com/OPENDAP/hyrax-dependencies - cd hyrax-dependencies - make --jobs=$jobs bison - - - name: checkout - uses: actions/checkout@v2 - - - name: configure - run: | - autoreconf -fiv - ./configure --enable-developer --prefix=$prefix - - - name: make - run: make rpm --jobs=$jobs - - # $HOME is /github/home - - name: upload to s3 - run: | - yum install -y awscli - aws s3 cp $HOME/rpmbuild/RPMS s3://opendap.github.actions.build --recursive - - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }} - - \ No newline at end of file diff --git a/.github/from_libdap4/distcheck.yml b/.github/from_libdap4/distcheck.yml deleted file mode 100644 index 5b4346bcd8..0000000000 --- a/.github/from_libdap4/distcheck.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This is the distcheck build stage from .travis.yml - -name: distcheck - -env: - prefix: ${{ github.workspace }}/build - jobs: 16 - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - ubuntu-build: - runs-on: ubuntu-16.04 - - steps: - - name: Packages - run: sudo apt-get --yes install libxml2-dev uuid-dev libcurl4-openssl-dev libcppunit-dev - - - name: cache-bison - id: cache-bison # Used below in the 'if' - uses: actions/cache@v2 - with: - path: $prefix/deps - key: bison-${{ runner.os }} - - - name: build bison dependency - if: steps.cache-bison.outputs.cache-hit != 'true' - run: | - pwd - git clone https://github.com/OPENDAP/hyrax-dependencies - cd hyrax-dependencies - make --jobs=$jobs bison - - - name: checkout - uses: actions/checkout@v2 - - - name: autoreconf - run: autoreconf --force --install --verbose - - - name: configure - run: ./configure --prefix=$prefix --enable-developer - - - name: Make - run: make distcheck -j7 - diff --git a/.github/from_libdap4/sonar-scan.yml b/.github/from_libdap4/sonar-scan.yml deleted file mode 100644 index 29e9484927..0000000000 --- a/.github/from_libdap4/sonar-scan.yml +++ /dev/null @@ -1,62 +0,0 @@ -## This is the sonar scan stage from .travis.yml - -name: sonar scan - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - sonarscan: - runs-on: ubuntu-16.04 - - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - - name: Installs - run: | - sudo apt-get update - sudo apt-get --yes install libxml2-dev uuid-dev libcurl4-openssl-dev libcppunit-dev gcovr - - - name: Download and unzip Sonar scanner file - run: | - set -x - sudo mkdir /downloads/sonar-scanner -p - cd /downloads/sonar-scanner - sudo wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip - sudo unzip sonar-scanner-cli-4.2.0.1873-linux.zip -d /opt/ - # ls -lart - sudo mv /opt/sonar-scanner-4.2.0.1873-linux/ /opt/sonar-scanner - # ls /opt/sonar-scanner - # ls /opt/sonar-scanner/conf - cd /opt/sonar-scanner - sudo chown -R $USER:$USER /opt/sonar-scanner/conf/sonar-scanner.properties - sudo echo "sonar.host.url=https://sonarcloud.io" >> /opt/sonar-scanner/conf/sonar-scanner.properties - sudo echo "sonar.login=$SONAR_LOGIN" >> /opt/sonar-scanner/conf/sonar-scanner.properties - export ssb="/opt/sonar-scanner/bin" - # ls -la ${ssb} - export PATH=${ssb}:${PATH} - sonar-scanner -v - - - name: Configure - run: | - autoreconf -i - ./configure --prefix=$prefix --enable-developer --enable-coverage - - - name: build wrapper & scan - run: | - sudo wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip - sudo unzip build-wrapper-linux-x86.zip - export LD_LIBRARY_PATH=$(pwd)/build-wrapper-linux-x86 - ./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make -j7 - /opt/sonar-scanner/bin/sonar-scanner -Dsonar.login=$SONAR_LOGIN - curl -s https://sonarcloud.io/api/project_badges/quality_gate?project=OPENDAP-libdap4 | grep "QUALITY GATE PASS" - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - diff --git a/.github/from_libdap4/src-distro-pkgbuild.yml b/.github/from_libdap4/src-distro-pkgbuild.yml deleted file mode 100644 index feb9b2ca92..0000000000 --- a/.github/from_libdap4/src-distro-pkgbuild.yml +++ /dev/null @@ -1,45 +0,0 @@ -# This is the source distribution package build - -name: source distribution - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - source-distribution: - runs-on: ubuntu-16.04 - - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - - name: Installs - run: | - sudo apt-get update - sudo apt-get --yes install libxml2-dev uuid-dev libcurl4-openssl-dev libcppunit-dev awscli - - - name: Configure - run: autoreconf -i - - # Make both a libdap- and libdap-snapshot tar.gz. This will simplify - # other operations that use the libdap source code like the bes build. - - name: Build source distro package - run: | - sudo mkdir -p $HOME/package - ./configure - make dist -j7 - sudo cp libdap-*.tar.gz $HOME/package - sudo cp libdap-*.tar.gz $HOME/package/libdap-snapshot.tar.gz; - - - name: upload to s3 - run: aws s3 cp $HOME/package s3://opendap.github.actions.build --recursive - - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }} - - diff --git a/.github/workflows/main.yml.never b/.github/workflows/main.yml.never deleted file mode 100644 index f0cfd0fb20..0000000000 --- a/.github/workflows/main.yml.never +++ /dev/null @@ -1,92 +0,0 @@ -# Copied from the libdap4 main.yml workflow written by Emmanuel Babalola. -# jhrg 2/24/21 - -name: Main build workflow - -env: - prefix: ${{ github.workspace }}/build - jobs: 16 - -on: - push: - branches: [ actions-build ] - pull_request: - branches: [ actions-build ] - workflow_dispatch: - -jobs: - ubuntu-build: - runs-on: ubuntu-20.04 - - steps: - - name: Set PATH - run: echo "$prefix/bin:$prefix/deps/bin" >> $GITHUB_PATH - #run: echo "$prefix/deps/bin:$prefix/bin" >> $GITHUB_PATH - - - name: Packages - run: sudo apt-get --yes install libxml2-dev uuid-dev libcurl4-openssl-dev libcppunit-dev libfl-dev gcovr - - - - name: cache-deps - id: cache-deps - uses: actions/cache@v2 - with: - path: $prefix/deps - key: deps-${{ runner.os }} - - - name: build dependencies - if: steps.cache-bison.outputs.cache-hit != 'true' - run: | - echo "PATH: $PATH" - git clone https://github.com/OPENDAP/hyrax-dependencies - cd hyrax-dependencies - make --jobs=$jobs - - - name: cache-libdap4 - id: cache-libdap4 - uses: actions/cache@v2 - with: - path: $prefix - key: libdap4-${{ runner.os }} - - - name: build libdap4 - if: steps.cache-libdap4.outputs.cache-hit != 'true' - run: | - git clone https://github.com/OPENDAP/libdap4 - cd libdap4 - autoreconf --force --install --verbose - ./configure --prefix=$prefix --enable-developer - make --jobs=$jobs - make check --jobs=$jobs - make install - - - name: build bes - run: | - git clone --recurse-submodules https://github.com/OPENDAP/bes - cd bes - autoreconf --force --install --verbose - ./configure --prefix=$prefix --with-dependencies=$prefix/deps --enable-developer - make --jobs=$jobs - make install - - # - name: checkout - # uses: actions/checkout@v2 - # with: - # submodules: 'recursive' - - # - name: autoreconf - # run: autoreconf --force --install --verbose - - # - name: configure - # run: | - # ./configure --prefix=$prefix --with-dependencies=$prefix/deps --enable-developer | tee foo - # grep -e "^checking for libdap .* yes$" foo - - # - name: Make - # run: make -j7 - - # - name: Check - # run: make -j7 check - - # - name: Install - # run: make install From 65cf54427a934f2cd329886d04413ed36b8a0cbd Mon Sep 17 00:00:00 2001 From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com> Date: Thu, 19 Mar 2026 16:29:25 -0400 Subject: [PATCH 3/3] remove files from configure too --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index 830b215fa5..d8078b3753 100644 --- a/configure.ac +++ b/configure.ac @@ -1127,8 +1127,6 @@ AH_BOTTOM([ AC_CONFIG_FILES([Makefile bes_VERSION - bes.spec - bes.spec.all_static abi_checker.xml bes_dispatch.pc bes_ppt.pc