From 4eec142c7bc086b34701fc97bf60fed781c7dff8 Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Tue, 3 Feb 2026 16:27:29 -0500
Subject: [PATCH 1/8] do not source build-rhel-docker from travis

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f467891507..40eeef2547 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -211,7 +211,12 @@ jobs:
         # have downstream access to the environment variable
         # `BUILD_VERSION_TAG` that must be exported AFTER the image
         # is built:
-        - source ${TRAVIS_BUILD_DIR}/travis/build-rhel-docker.sh
+        - ${TRAVIS_BUILD_DIR}/travis/build-rhel-docker.sh
+        - |
+          export BES_VERSION="$(docker run --rm ${SNAPSHOT_IMAGE_TAG} -c 'cat bes_VERSION')"
+          export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${BES_VERSION}"
+          echo "Tagging image with BES version: ${BUILD_VERSION_TAG}"
+          docker tag ${SNAPSHOT_IMAGE_TAG} ${BUILD_VERSION_TAG}
 
     - stage: build-and-package
       name: "dist"

From 95d4c5e8430946b20bd62903a717083e40c7e11a Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Tue, 3 Feb 2026 16:29:25 -0500
Subject: [PATCH 2/8] also remove from build script

---
 travis/build-rhel-docker.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/travis/build-rhel-docker.sh b/travis/build-rhel-docker.sh
index f5ce9cccb9..578dbf465f 100644
--- a/travis/build-rhel-docker.sh
+++ b/travis/build-rhel-docker.sh
@@ -89,15 +89,4 @@ docker build \
 echo "Docker build complete!"
 docker image ls -a
 
-loggy "Tagging the image with its version number..."
-export BES_VERSION="$(docker run --rm ${SNAPSHOT_IMAGE_TAG} -c 'cat bes_VERSION')"
-echo "BES_VERSION is ${BES_VERSION}"
-export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${BES_VERSION}"
-echo "BUILD_VERSION_TAG is ${BUILD_VERSION_TAG}"
-docker tag ${SNAPSHOT_IMAGE_TAG} ${BUILD_VERSION_TAG}
-
 loggy "Complete!"
-
-# Because this script is often sourced (at least by travis),
-# unset these commands to prevent spurious downstream failures
-set +eux
\ No newline at end of file

From 46add48bc475246948b3fc15ddccb11594edad1f Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Tue, 3 Feb 2026 16:30:48 -0500
Subject: [PATCH 3/8] also update comment

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 40eeef2547..6e4b63b028 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -207,11 +207,10 @@ jobs:
         - export DIST=el8
         - export OS=rocky8
         - export BES_REPO_DIR=${TRAVIS_BUILD_DIR}
-        # Note: We use `source` instead of `bash` here so that we
-        # have downstream access to the environment variable
-        # `BUILD_VERSION_TAG` that must be exported AFTER the image
-        # is built:
         - ${TRAVIS_BUILD_DIR}/travis/build-rhel-docker.sh
+        # Note: We need downstream access to the environment variable
+        # `BUILD_VERSION_TAG` that can only be determined AFTER the image
+        # is built:
         - |
           export BES_VERSION="$(docker run --rm ${SNAPSHOT_IMAGE_TAG} -c 'cat bes_VERSION')"
           export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${BES_VERSION}"

From 85c51e491690ce0c54aed8ec374f5682f9cbc15d Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Wed, 4 Feb 2026 10:03:47 -0500
Subject: [PATCH 4/8] make script executable

---
 travis/build-rhel-docker.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 travis/build-rhel-docker.sh

diff --git a/travis/build-rhel-docker.sh b/travis/build-rhel-docker.sh
old mode 100644
new mode 100755

From 7efea8bb5f71d230017a4ebe163ce1d20511299c Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:11:59 -0500
Subject: [PATCH 5/8] add .

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6e4b63b028..d09f1b7c44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -207,7 +207,7 @@ jobs:
         - export DIST=el8
         - export OS=rocky8
         - export BES_REPO_DIR=${TRAVIS_BUILD_DIR}
-        - ${TRAVIS_BUILD_DIR}/travis/build-rhel-docker.sh
+        - ./${TRAVIS_BUILD_DIR}/travis/build-rhel-docker.sh
         # Note: We need downstream access to the environment variable
         # `BUILD_VERSION_TAG` that can only be determined AFTER the image
         # is built:

From e12fc1932285b34f1e5aea9793bedd5820a8cb90 Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:50:57 -0500
Subject: [PATCH 6/8] path sadness

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d09f1b7c44..f273f7dfd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -207,7 +207,7 @@ jobs:
         - export DIST=el8
         - export OS=rocky8
         - export BES_REPO_DIR=${TRAVIS_BUILD_DIR}
-        - ./${TRAVIS_BUILD_DIR}/travis/build-rhel-docker.sh
+        - ./travis/build-rhel-docker.sh
         # Note: We need downstream access to the environment variable
         # `BUILD_VERSION_TAG` that can only be determined AFTER the image
         # is built:

From ae299b79daa7da20e8581ea051f527b07ca52840 Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Wed, 4 Feb 2026 11:52:12 -0500
Subject: [PATCH 7/8] add name to gha job for better legibility

---
 .github/workflows/.build-osx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/.build-osx.yml b/.github/workflows/.build-osx.yml
index 32b0b22d8d..ef366c4916 100644
--- a/.github/workflows/.build-osx.yml
+++ b/.github/workflows/.build-osx.yml
@@ -1,6 +1,6 @@
 # Build the bes for the same architecture as OPeNDAP developer
 # machines, to ensure code changes won't break local development
-
+name: OSX CI
 on:
   # For now, run only on manually triggered builds (workflow_dispatch).
   # Uncomment the "push" and "pull_request" to build on all non-draft PRs

From 7e6cd55b2dec3c2673391d7cedf161f5e2f4b9be Mon Sep 17 00:00:00 2001
From: Hannah Robertson <1076701+hannahilea@users.noreply.github.com>
Date: Wed, 4 Feb 2026 12:55:17 -0500
Subject: [PATCH 8/8] update sh to bash

---
 travis/build-rhel-docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/build-rhel-docker.sh b/travis/build-rhel-docker.sh
index 578dbf465f..0750e476ef 100755
--- a/travis/build-rhel-docker.sh
+++ b/travis/build-rhel-docker.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This is part of the Travis build CD process. It is intended to be
 # run from within the Travis build process and depends on env variables