Skip to content

Commit 0f87525

Browse files
committed
Fix bad merge of CI tests, remove "push" rules
1 parent 4bd3dd2 commit 0f87525

File tree

6 files changed

+6
-56
lines changed

6 files changed

+6
-56
lines changed

.github/workflows/ci_build_scm_ubuntu_22.04.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI test to build the CCPP-SCM on ubuntu v22.04
22

3-
on: [pull_request,workflow_dispatch,push]
3+
on: [pull_request,workflow_dispatch]
44

55
jobs:
66
build_scm:
@@ -68,20 +68,6 @@ jobs:
6868
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
6969
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
7070
71-
- name: Install open mpi
72-
run: |
73-
wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
74-
tar -xvf v4.1.6.tar.gz
75-
cd ompi-4.1.6
76-
./autogen.pl
77-
./configure --prefix=/home/runner/ompi-4.1.6
78-
make -j4
79-
make install
80-
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
81-
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
82-
echo "CC=mpicc" >> $GITHUB_ENV
83-
echo "FC=mpif90" >> $GITHUB_ENV
84-
8571
- name: Cache bacio library v2.4.1
8672
id: cache-bacio-fortran
8773
uses: actions/cache@v3

.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI test to build the CCPP-SCM on ubuntu v22.04
22

3-
on: [pull_request,workflow_dispatch,push]
3+
on: [pull_request,workflow_dispatch]
44

55
jobs:
66

.github/workflows/ci_run_scm_DEPHY.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI test to run the SCM with DEPHY v1 data
22

3-
on: [pull_request,workflow_dispatch,push]
3+
on: [pull_request,workflow_dispatch]
44

55
jobs:
66
run-scm-DEPHY:
@@ -51,23 +51,6 @@ jobs:
5151
- name: Update system packages
5252
run: sudo apt-get update
5353

54-
#######################################################################################
55-
# Install OpenMPI
56-
#######################################################################################
57-
- name: Install open mpi
58-
run: |
59-
wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
60-
tar -xvf v4.1.6.tar.gz
61-
cd ompi-4.1.6
62-
./autogen.pl
63-
./configure --prefix=/home/runner/ompi-4.1.6
64-
make -j4
65-
make install
66-
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
67-
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
68-
echo "CC=mpicc" >> $GITHUB_ENV
69-
echo "FC=mpif90" >> $GITHUB_ENV
70-
7154

7255
#######################################################################################
7356
# Install FORTRAN dependencies

.github/workflows/ci_run_scm_rts.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI test to build and run SCM regression tests
22

3-
on: [pull_request, workflow_dispatch,push]
3+
on: [pull_request, workflow_dispatch]
44

55
jobs:
66
run_scm_rts:
@@ -72,25 +72,6 @@ jobs:
7272
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
7373
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
7474
75-
#######################################################################################
76-
# OpenMPI setup
77-
#######################################################################################
78-
79-
- name: Install open mpi
80-
run: |
81-
wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
82-
tar -xvf v4.1.6.tar.gz
83-
cd ompi-4.1.6
84-
./autogen.pl
85-
./configure --prefix=/home/runner/ompi-4.1.6
86-
make -j4
87-
make install
88-
echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
89-
echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
90-
echo `ls /home/runner/ompi-4.1.6/bin`
91-
echo "FC=mpif90" >> $GITHUB_ENV
92-
echo "CC=mpicc" >> $GITHUB_ENV
93-
9475
#######################################################################################
9576
# Install FORTRAN dependencies
9677
#######################################################################################

.github/workflows/ci_run_scm_ufs_replay.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI test to create SCM UFS-replay cases from UWM regression tests
22

3-
on: [pull_request,workflow_dispatch,push]
3+
on: [pull_request,workflow_dispatch]
44

55
jobs:
66
run_scm_ufs_replay:

.github/workflows/ci_test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build_test_and_push_docker
22

3-
on: [pull_request,workflow_dispatch,push]
3+
on: [pull_request,workflow_dispatch]
44

55
env:
66
TEST_TAG: dtcenter/ccpp-scm:test

0 commit comments

Comments
 (0)