Skip to content

Commit

Permalink
Fix bad merge of CI tests, remove "push" rules
Browse files Browse the repository at this point in the history
  • Loading branch information
mkavulich committed May 31, 2024
1 parent 4bd3dd2 commit 0f87525
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 56 deletions.
16 changes: 1 addition & 15 deletions .github/workflows/ci_build_scm_ubuntu_22.04.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI test to build the CCPP-SCM on ubuntu v22.04

on: [pull_request,workflow_dispatch,push]
on: [pull_request,workflow_dispatch]

jobs:
build_scm:
Expand Down Expand Up @@ -68,20 +68,6 @@ jobs:
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
- name: Install open mpi
run: |
wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
tar -xvf v4.1.6.tar.gz
cd ompi-4.1.6
./autogen.pl
./configure --prefix=/home/runner/ompi-4.1.6
make -j4
make install
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
echo "CC=mpicc" >> $GITHUB_ENV
echo "FC=mpif90" >> $GITHUB_ENV
- name: Cache bacio library v2.4.1
id: cache-bacio-fortran
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI test to build the CCPP-SCM on ubuntu v22.04

on: [pull_request,workflow_dispatch,push]
on: [pull_request,workflow_dispatch]

jobs:

Expand Down
19 changes: 1 addition & 18 deletions .github/workflows/ci_run_scm_DEPHY.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI test to run the SCM with DEPHY v1 data

on: [pull_request,workflow_dispatch,push]
on: [pull_request,workflow_dispatch]

jobs:
run-scm-DEPHY:
Expand Down Expand Up @@ -51,23 +51,6 @@ jobs:
- name: Update system packages
run: sudo apt-get update

#######################################################################################
# Install OpenMPI
#######################################################################################
- name: Install open mpi
run: |
wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
tar -xvf v4.1.6.tar.gz
cd ompi-4.1.6
./autogen.pl
./configure --prefix=/home/runner/ompi-4.1.6
make -j4
make install
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
echo "CC=mpicc" >> $GITHUB_ENV
echo "FC=mpif90" >> $GITHUB_ENV

#######################################################################################
# Install FORTRAN dependencies
Expand Down
21 changes: 1 addition & 20 deletions .github/workflows/ci_run_scm_rts.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI test to build and run SCM regression tests

on: [pull_request, workflow_dispatch,push]
on: [pull_request, workflow_dispatch]

jobs:
run_scm_rts:
Expand Down Expand Up @@ -72,25 +72,6 @@ jobs:
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
#######################################################################################
# OpenMPI setup
#######################################################################################

- name: Install open mpi
run: |
wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
tar -xvf v4.1.6.tar.gz
cd ompi-4.1.6
./autogen.pl
./configure --prefix=/home/runner/ompi-4.1.6
make -j4
make install
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
echo `ls /home/runner/ompi-4.1.6/bin`
echo "FC=mpif90" >> $GITHUB_ENV
echo "CC=mpicc" >> $GITHUB_ENV
#######################################################################################
# Install FORTRAN dependencies
#######################################################################################
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_run_scm_ufs_replay.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI test to create SCM UFS-replay cases from UWM regression tests

on: [pull_request,workflow_dispatch,push]
on: [pull_request,workflow_dispatch]

jobs:
run_scm_ufs_replay:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_docker.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: build_test_and_push_docker

on: [pull_request,workflow_dispatch,push]
on: [pull_request,workflow_dispatch]

env:
TEST_TAG: dtcenter/ccpp-scm:test
Expand Down

0 comments on commit 0f87525

Please sign in to comment.