Merge branch 'main' into hikari-rewrite

.github/workflows/build.yml

@@ -29,6 +29,7 @@ jobs:
           tags: |
             type=sha,format=long
             type=match,pattern=main
+            type=raw,value=latest,enable={{is_default_branch}}
           flavor: |
             latest=auto
 

.github/workflows/deploy.yml

@@ -2,16 +2,18 @@ name: Deploy
 
 on:
   push:
-  workflow_dispatch:
+  pull_request:
+    types: [closed]
 
-concurrency:
-  group: '${{ github.ref }}'
-  cancel-in-progress: true
+  #concurrency:
+  #  group: '${{ github.ref }}'
+  #  cancel-in-progress: true
 
 jobs:
   build:
     name: build
     uses: './.github/workflows/build.yml'
+    if: github.event_name != 'pull_request'
 
   deploy_review:
     needs:
@@ -20,7 +22,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 == 'push'
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
@@ -32,26 +34,23 @@ jobs:
           ./.github/deploy/review.hcl
 
   stop_review:
-    needs:
-      - build
     runs-on: [self-hosted, deployment-runner]
     container:
       image: multani/nomad
-    if: github.event_name == 'workflow_dispatch'
+    if: github.event_name == 'pull_request'
     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_HEAD_REF}
 
   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 == 'push'
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4