Fix deploy script (#29)

* Fix workflow trigger
CAPTxTreeckle · Feb 22, 2024 · aa81852 · aa81852
1 parent 6ea139e
commit aa81852
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -1,11 +1,11 @@
 name: Deploy to Beta
 
 on:
-  pull_request:
+  push:
     branches: ["master"]
-    types: ["opened"]
     paths:
       - frontend/**
+      - backend/**
   workflow_dispatch:
 
 jobs:
@@ -28,23 +28,23 @@ jobs:
             git stash
 
             # Pull from git repo
-            git checkout ${{ github.event.pull_request.head.sha || 'master' }} || true # Force return true so exit code is not 1
+            git checkout master || true # Force return true so exit code is not 1
             git pull
 
             # Clear space
             echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker image prune -f
 
             # Build frontend
             cd frontend
-            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S bash ./build-prod.sh
+            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S bash ./build.sh
+            cd ..
 
             # Build backend
             cd backend
-            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker build -t jermytan/treeckle-backe
-            nd:production .
+            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker build -t jermytan/treeckle-backend:latest .
+            cd ..
 
             # Deploy
-            cd ..
             echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker-compose -f ./docker-compose.prod.yml up -d frontend-staging
             echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker-compose -f ./docker-compose.prod.yml up -d backend-staging
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,11 +29,18 @@ jobs:
             # Clear space
             echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker image prune -f
 
-            # Build
+            # Build frontend
             cd frontend
             echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S bash ./build-prod.sh
             cd ..
-            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker-compose -f ./docker-compose.prod.yml up -d
+
+            # Build backend
+            cd backend
+            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker build -t jermytan/treeckle-backend:production .
+            cd ..
+
+            # Deploy
+            echo "${{ secrets.SUDO_PASSWORD }}" | sudo -S docker-compose -f ./docker-compose.prod.yml up -d 
 
             # Restore changes
             git stash pop || true # Force return true in case no changes stashed