diff --git a/.github/workflows/eamxx-gh-ci-standalone.yml b/.github/workflows/eamxx-gh-ci-standalone.yml index 949a0eaae9b6..523633cf0375 100644 --- a/.github/workflows/eamxx-gh-ci-standalone.yml +++ b/.github/workflows/eamxx-gh-ci-standalone.yml @@ -52,6 +52,18 @@ jobs: env: SHELL: sh run: | - # get rid of this extra line if we can? + # TODO: get rid of this extra line if we can? git config --global safe.directory '*' ./components/eamxx/scripts/test-all-scream -m ghci-oci -t ${{ matrix.test }} + # TODO: add logging... + # - + # name: Artifacts + # uses: actions/upload-artifact@v4 + # if: ${{ always() }} + # with: + # name: ${{ matrix.test }} + # path: | + # /projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log + # /projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.* + # /projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.* + # /projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out diff --git a/components/eamxx/cmake/BuildCprnc.cmake b/components/eamxx/cmake/BuildCprnc.cmake index 5ff4fa545d9b..287956c5a9dd 100644 --- a/components/eamxx/cmake/BuildCprnc.cmake +++ b/components/eamxx/cmake/BuildCprnc.cmake @@ -11,6 +11,7 @@ macro(BuildCprnc) # TODO: handle this more carefully and more gracefully in the future # TODO: For now, it is just a hack to get going... # find cprnc defined in machine entries + set(CCSM_CPRNC $ENV{CCSM_CPRNC}) if(EXISTS "${CCSM_CPRNC}") message(STATUS "Path ${CCSM_CPRNC} exists, so we will use it") set(CPRNC_BINARY ${CCSM_CPRNC} CACHE INTERNAL "") diff --git a/components/eamxx/cmake/machine-files/ghci-oci.cmake b/components/eamxx/cmake/machine-files/ghci-oci.cmake index aecdac764bc9..85eabbaa848a 100644 --- a/components/eamxx/cmake/machine-files/ghci-oci.cmake +++ b/components/eamxx/cmake/machine-files/ghci-oci.cmake @@ -12,4 +12,4 @@ set(EKAT_MPI_NP_FLAG "-np" CACHE STRING "-np") # TODO: hack in place to get eamxx to recognize CPRNC # TODO: See note in BuildCprnc.cmake... -set(CCSM_CPRNC "/usr/local/packages/bin/cprnc") +set(ENV{CCSM_CPRNC} "/usr/local/packages/bin/cprnc")