Update ci container (#117)

* Update ci container

* allow manual trigger of ci

* temporary change to force ci to run

* revert temporary change as ci now gets past cmake config step

.github/workflows/ci.yml

@@ -5,9 +5,10 @@ on:
     branches: [develop]
   pull_request:
     branches: [develop]
+  workflow_dispatch:
 env:
     REGISTRY: ghcr.io
-    IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.3.0
+    IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.4.0
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -32,6 +33,13 @@ jobs:
           repository: JCSDA-internal/oops
           token: ${{ secrets.GHCR_PAT }}
 
+      - name: checkout vader
+        uses: actions/checkout@v3
+        with:
+          path: ci/vader
+          repository: JCSDA-internal/vader
+          token: ${{ secrets.GHCR_PAT }}
+
       - name: checkout saber
         uses: actions/checkout@v3
         with:

VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

ci/CMakeLists.txt

@@ -18,6 +18,7 @@ if(NOT DEFINED jedicmake_DIR)
 endif()
 
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/oops" EXCLUDE_FROM_ALL)
+add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/vader" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/saber" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ioda" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ufo" EXCLUDE_FROM_ALL)

ci/hpccm_recipe_almalinux9.py

@@ -50,6 +50,7 @@ def gitlab_url(repo, vn):
 odc_vn = USERARG.get('odc_vn', '1.5.2')
 openmpi_vn = USERARG.get('openmpi_vn', '4.1.5')
 pycodestyle_vn = USERARG.get('pycodestyle_vn', '2.10')
+qhull_vn = USERARG.get('qhull_vn', '8.0.2')  # no qhull-devel rpm
 udunits_vn = USERARG.get('udunits_vn', '2.2.28')
 yaxt_vn = USERARG.get('yaxt_vn', '528-0.10.0')  # URL has a number and a version
 
@@ -203,6 +204,13 @@ def gitlab_url(repo, vn):
     cmake_opts=['-DCMAKE_BUILD_TYPE=Release', '-DJSON_BuildTests=OFF'],
 )
 
+Stage0 += generic_cmake(
+    prefix='/usr/local',
+    url=github_url('qhull/qhull', f'v{qhull_vn}'),
+    directory=f'qhull-{qhull_vn}',
+    cmake_opts=['-DCMAKE_BUILD_TYPE=Release'],
+)
+
 Stage0 += generic_cmake(
     prefix='/usr/local',
     url=github_url('NOAA-EMC/NCEPLIBS-bufr', f'v{nceplibs_bufr_vn}'),