@@ -19,46 +19,40 @@ jobs:
1919
2020 - name : Install xmllint
2121 run : sudo apt-get install -y libxml2-utils
22-
22+ - name : Checkout VisualCaseGen to temp folder
23+ uses : actions/checkout@v4
24+ with :
25+ submodules : recursive
26+ path : VCGTEMP
2327 # clone CESM
24- - uses : actions/checkout@v4
28+ - name : Checkout CESM
29+ uses : actions/checkout@v4
2530 with :
2631 repository : alperaltuntas/CESM
2732 ref : cesm3_0_beta03_gui
33+ path : CESM
2834 # submodules: recursive
2935
3036 # Run git-fleximod
31- - name : checkout CESM
37+ - name : Checkout CESM submodules
3238 env :
3339 GIT_CLONE_PROTECTION_ACTIVE : false
3440 run : |
41+ cd CESM
3542 ./bin/git-fleximod update
36-
37- # Checkout the correct visualCaseGen branch
38- - name : Checkout initial event (Pull Request)
39- if : ${{ github.event_name == 'pull_request' }}
43+
44+ # Copy the checked out visualCaseGen branch to the CESM visualCaseGen folder
45+ - name : Copy VCG checkout into the correct folder
4046 run : |
41- echo "Handling pull request"
42- cd visualCaseGen/
43- git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-${{ github.event.pull_request.number }}
44- git checkout pr-${{ github.event.pull_request.number }}
45- git submodule update --init
46-
47- - name : Checkout initial event (Push)
48- if : ${{ github.event_name == 'push' }}
49- run : |
50- echo "Handling push"
51- cd visualCaseGen/
52- git checkout ${{ github.sha }}
53- git submodule update --init
47+ cp -r VCGTEMP/* CESM/visualCaseGen/
5448
5549 # set up conda
5650 - uses : conda-incubator/setup-miniconda@v3
5751
5852 # visualCaseGen conda env
5953 - name : Create visualCaseGen conda env
6054 run : |
61- cd visualCaseGen/
55+ cd CESM/ visualCaseGen/
6256 conda env create --file environment.yml
6357 conda activate visualCaseGen
6458
7165 run : |
7266 export SRC_PATH="${GITHUB_WORKSPACE}"
7367 mkdir -p /home/runner/cesm/scratch
74- cd visualCaseGen/
68+ cd CESM/ visualCaseGen/
7569 conda activate visualCaseGen
7670 pytest tests
77-
0 commit comments