Skip to content
Merged
21 changes: 7 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ services:
branches:
only:
- master
- el9
- main
- /^(.*-test-deploy)$/

notifications:
email:
Expand Down Expand Up @@ -66,11 +67,11 @@ install:

stages:
- name: BUILD_AND_TEST
if: branch = master OR branch = el9
if: branch = master OR branch = main OR branch =~ ^(.*-test-deploy)$
- name: BUILD
if: branch = master OR branch = el9
if: branch = master OR branch = main OR branch =~ ^(.*-test-deploy)$
- name: TEST_DEPLOYED_IMAGE
if: ((branch = master) and (type != pull_request)) or (branch = el9)
if: ((branch = master or branch = main) and (type != pull_request)) or (branch =~ ^(.*-test-deploy)$)
- name: disabled
if: branch = disabled

Expand Down Expand Up @@ -249,13 +250,5 @@ deploy:
- provider: script
script: bash "$TRAVIS_BUILD_DIR/travis/deploy_to_docker_hub.sh"
on:
branch: master
condition: $DEPLOY_ME = "true"

- provider: script
script: bash "$TRAVIS_BUILD_DIR/travis/deploy_to_docker_hub.sh"
on:
branch: el9
condition: $DEPLOY_ME = "true"


all_branches: true
condition: ( ( ( branch = master ) AND ( type != pull_request ) ) OR ( branch =~ ^(.*-test-deploy)$ ) ) ) AND ( "$DEPLOY_ME" = "true" )
2 changes: 1 addition & 1 deletion el9-builds/ngap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ RUN set -e \
&& git clone https://github.com/OPENDAP/olfs \
#&& git clone --depth 1 https://github.com/OPENDAP/olfs \
&& cd olfs \
&& git checkout tomcat-11 \
&& git checkout el9 \
&& cd .. \
&& echo "$HR2" >&2 \
&& echo "Copying elasticache client" >&2 \
Expand Down
8 changes: 4 additions & 4 deletions travis-build-recipe
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TARGET_OS: el9
TOMCAT_MAJOR_VERSION: 11
TARGET_OS: el8
TOMCAT_MAJOR_VERSION: 9
libdap4-3.21.1-383 2026-03-02T18:07:16+0000
bes-3.21.1-1087 2026-03-02T19:09:35+0000
olfs-1.18.15-711 2026-03-02T19:38:38+0000
hyrax-1.17.1-711 2026-03-02T19:38:39+0000
olfs-1.18.15-710 2026-03-02T19:20:46+0000
hyrax-1.17.1-710 2026-03-02T19:20:46+0000