diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml index e1449d02f..43916bf12 100644 --- a/.github/workflows/dev-deploy.yml +++ b/.github/workflows/dev-deploy.yml @@ -12,6 +12,7 @@ env: jobs: dev_server_status: + if: github.ref == 'refs/heads/dev-deploy' runs-on: ubuntu-latest steps: @@ -37,7 +38,7 @@ jobs: dev_server_connection_dev: runs-on: ubuntu-latest - + needs: dev_server_status steps: - name: SSH to remote OHRI Dev server run: | @@ -48,7 +49,10 @@ jobs: dev_deploy: runs-on: ubuntu-latest + needs: dev_server_status + if: (github.event_name == 'push' || github.event.pull_request.merged) + steps: - name: Checkout code uses: actions/checkout@v2 @@ -73,6 +77,7 @@ jobs: working_server_status: + if: github.ref == 'refs/heads/dev-deploy' runs-on: ubuntu-latest steps: @@ -109,6 +114,9 @@ jobs: working_deploy: runs-on: ubuntu-latest + needs: dev_server_status + + if: (github.event_name == 'push' || github.event.pull_request.merged) steps: - name: Checkout code