tidy ci yaml

MetOffice · Sep 5, 2023 · d015d2c · d015d2c
1 parent bda7bba
commit d015d2c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,6 +13,14 @@ jobs:
       - name: checkout current repo
         uses: actions/checkout@v3
 
+      - name: checkout jedicmake
+        uses: actions/checkout@v3
+        with:
+          path: ci/jedicmake
+          repository: JCSDA-internal/jedi-cmake
+          submodules: true
+          token: ${{ secrets.GH_PAT }}
+
       - name: checkout ropp-ufo
         uses: actions/checkout@v3
         with:
@@ -30,14 +38,6 @@ jobs:
         if: github.event_name == 'pull_request'
         run: ./ci/get-ref-branch ./ci/oops
 
-      - name: checkout jedicmake
-        uses: actions/checkout@v3
-        with:
-          path: ci/jedicmake
-          repository: JCSDA-internal/jedi-cmake
-          submodules: true
-          token: ${{ secrets.GH_PAT }}
-
       - name: checkout ioda
         uses: actions/checkout@v3
         with:
@@ -58,6 +58,16 @@ jobs:
         if: github.event_name == 'pull_request'
         run: ./ci/get-ref-branch ./ci/ufo
 
+      - name: checkout opsinputs
+        uses: actions/checkout@v3
+        with:
+          path: ci/ufo
+          repository: MetOffice/opsinputs
+          # token: ${{ secrets.GH_PAT }}
+      - name: matching branch checkout attempt opsinputs ${{ github.head_ref }}
+        if: github.event_name == 'pull_request'
+        run: ./ci/get-ref-branch ./ci/opsinputs
+
       - name: build and test
         run: |
           az acr login --name ngmssboxjediacr

diff --git a/ci/CMakeLists.txt b/ci/CMakeLists.txt
@@ -12,10 +12,10 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/jedicmake")
 if(NOT DEFINED jedicmake_DIR)
   set(jedicmake_DIR "${CMAKE_BINARY_DIR}/jedicmake")
 endif()
+add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ropp-ufo" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/oops" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ioda" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ufo" EXCLUDE_FROM_ALL)
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ropp-ufo" EXCLUDE_FROM_ALL)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/opsinputs")
 
 include(CTest)