From 0f87525b3cdcc3586de0fc123ddda07ebaa23590 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Fri, 31 May 2024 04:45:49 +0000 Subject: [PATCH] Fix bad merge of CI tests, remove "push" rules --- .../workflows/ci_build_scm_ubuntu_22.04.yml | 16 +------------- .../ci_build_scm_ubuntu_22.04_nvidia.yml | 2 +- .github/workflows/ci_run_scm_DEPHY.yml | 19 +---------------- .github/workflows/ci_run_scm_rts.yml | 21 +------------------ .github/workflows/ci_run_scm_ufs_replay.yml | 2 +- .github/workflows/ci_test_docker.yml | 2 +- 6 files changed, 6 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index e4571b607..7eaabd29d 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -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: @@ -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 diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml index 4d9ce78e6..f5a808aad 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml @@ -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: diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 0097f924a..ebf97c9a1 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -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: @@ -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 diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index c88e7d771..7f44478eb 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -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: @@ -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 ####################################################################################### diff --git a/.github/workflows/ci_run_scm_ufs_replay.yml b/.github/workflows/ci_run_scm_ufs_replay.yml index 4cdfb5ba3..d252e1425 100644 --- a/.github/workflows/ci_run_scm_ufs_replay.yml +++ b/.github/workflows/ci_run_scm_ufs_replay.yml @@ -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: diff --git a/.github/workflows/ci_test_docker.yml b/.github/workflows/ci_test_docker.yml index bb5908d59..3406d8326 100644 --- a/.github/workflows/ci_test_docker.yml +++ b/.github/workflows/ci_test_docker.yml @@ -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