Change when workflows run

redbrick · Jan 29, 2024 · 7ff48b5 · 7ff48b5
1 parent 3ea3828
commit 7ff48b5
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: [self-hosted, deployment-runner]
     container:
       image: git.dbyte.xyz/distro/levant
-    if: github.ref != 'refs/heads/master' && github.event_name == 'workflow_dispatch'
+    if: github.ref != 'refs/heads/main' && github.event_name != 'workflow_dispatch'
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
@@ -37,21 +37,20 @@ jobs:
     runs-on: [self-hosted, deployment-runner]
     container:
       image: multani/nomad
-    if: github.event_name == 'workflow_dispatch'
+    if: github.ref != 'refs/heads/main' && github.event_name == 'workflow_dispatch'
     timeout-minutes: 60
     steps:
       - run: echo "null"
       - run: nomad status -address=http://nomad.service.consul:4646
-      - run: nomad job stop -address=http://nomad.service.consul:4646 -purge blockbot-${GITHUB_SHA}
+      - run: nomad job stop -address=http://nomad.service.consul:4646 -purge blockbot-${GITHUB_REF_NAME}
 
   deploy_prod:
     needs:
-      - deploy_review
-      - stop_review
+      - build
     runs-on: [self-hosted, deployment-runner]
     container:
       image: git.dbyte.xyz/distro/levant
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch'
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4