Skip to content

Commit

Permalink
Merge branch 'master' into loop_architecture_pt_3
Browse files Browse the repository at this point in the history
  • Loading branch information
phschaad authored May 29, 2024
2 parents 5869236 + b6fbd76 commit 4bc7c69
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/pyFV3-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [ master, ci-fix ]
pull_request:
branches: [ master, ci-fix ]
merge_group:
branches: [ master, ci-fix ]

defaults:
run:
Expand Down Expand Up @@ -35,8 +37,8 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install library dependencies
run: |
sudo apt-get install libopenmpi-dev libboost-all-dev gcc-13
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
sudo apt-get update
sudo apt-get install -y libopenmpi-dev libboost-all-dev
gcc --version
# Because Github doesn't allow us to do a git checkout in code
# we use a trick to checkout DaCe first (not using the external submodule)
Expand Down

0 comments on commit 4bc7c69

Please sign in to comment.