Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ubuntu-ci-x86_64.yaml - change spack-stack-1.7.0 location #65

Merged
merged 10 commits into from
Jun 24, 2024
Merged

Update ubuntu-ci-x86_64.yaml - change spack-stack-1.7.0 location #65

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c04a02
Update ubuntu-ci-x86_64.yaml - change spack-stack-1.7.0 location
climbfuji Jun 13, 2024
83244d3
Update ubuntu-ci-x86_64.yaml
climbfuji Jun 13, 2024
66be56b
Update CMakeLists.txt - use soca branch feature/ufs_dom_update_update…
climbfuji Jun 14, 2024
ad56408
Split .github/workflows/ubuntu-ci-x86_64.yaml workflow into smaller s…
climbfuji Jun 18, 2024
9fe6862
Update CMakeLists.txt
climbfuji Jun 19, 2024
a64e067
Revert temporary change of soca branch in CMakeLists.txt
climbfuji Jun 20, 2024
683cd2f
Merge branch 'bugfix/spst170_install_location' of https://github.com/…
climbfuji Jun 20, 2024
56f1ecd
Revert temporary branch name change for fv3-jedi
climbfuji Jun 21, 2024
bdbaa67
Change fv3-jedi branch name again for testing
climbfuji Jun 21, 2024
f1a8ae5
Revert CMakeLists.txt temp branch name change for fv3-jedi
climbfuji Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions .github/workflows/ubuntu-ci-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
module use /home/ubuntu/spack-stack/modulefiles
module load ecflow/5.11.4

module use /home/ubuntu/spack-stack/spack-stack-1.7.0/envs/ue-intel-2021.10.0/install/modulefiles/Core/
module use /home/ubuntu/spack-stack-1.7.0/envs/ue-intel-2021.10.0/install/modulefiles/Core/
module load stack-intel/2021.10.0
module load stack-intel-oneapi-mpi/2021.10.0
module load stack-python/3.10.13
Expand All @@ -107,7 +107,7 @@ jobs:

EOF

- name: clone-build-bundle
- name: clone-bundle
env:
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
UFS_BUNDLE_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
Expand All @@ -129,10 +129,18 @@ jobs:
echo "Check out a fresh copy of ufs-bundle"
git clone -b ${UFS_BUNDLE_BRANCH_NAME} https://github.com/jcsda/ufs-bundle
fi
### DO WE REALLY NEED THIS ??? rm -fr build-*

# UFS_APP=ATM
- name: build-atm
env:
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
run: |
# In run directory
cd ${JEDI_ENV}
rm -rf build-*

# Set environment
source setup.sh

mkdir -p build-atm
cd build-atm
cmake -DUFS_APP=ATM ../ufs-bundle
Expand All @@ -144,25 +152,48 @@ jobs:
rm -rf fv3-jedi/test/Data/ModelRunDirs/UFS_warmstart_2/*
ctest -V -R ufs_

# UFS_APP=ATMAERO
- name: build-atmaero
env:
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
run: |
# In run directory
cd ${JEDI_ENV}

# Set environment
source setup.sh

mkdir -p build-atmaero
cd build-atmaero
cmake -DUFS_APP=ATMAERO ../ufs-bundle
make update
make -j8

# Skip those for now - linker errors because of static/dynamic library mix
UFS_APP=NG-GODAS
- name: build-ng-godas
env:
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
run: |
# In run directory
cd ${JEDI_ENV}

# Set environment
source setup.sh

mkdir -p build-ng-godas
cd build-ng-godas
cmake -DUFS_APP=NG-GODAS ../ufs-bundle
make update
make -j8
#
# UFS_APP=S2S

- name: build-s2s
env:
JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run
run: |
# In run directory
cd ${JEDI_ENV}

# Set environment
source setup.sh

mkdir -p build-s2s
cd build-s2s
cmake -DUFS_APP=S2S ../ufs-bundle
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.gi
if(UFS_APP MATCHES "^(ATMAERO)$" OR UFS_APP MATCHES "^(S2S)$" OR UFS_APP MATCHES "^(ATM)$")
option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON)
ecbuild_bundle( PROJECT fv3-jedi-data GIT "https://github.com/JCSDA-internal/fv3-jedi-data.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH bugfix/ufs_s2s_cdeps_dependency UPDATE ) # develop UPDATE )
elseif(UFS_APP MATCHES "^(NG-GODAS)$")
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom_update UPDATE )
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom_update_update ) # feature/ufs_dom_update UPDATE )
add_dependencies(soca ufs-weather-model)
else()
message(FATAL_ERROR "ufs-bundle unknown UFS_APP ${UFS_APP}")
Expand Down
Loading