update template workflows

Author: TimChild

other-templates/github-workflows/deploy-reflex-site.template.yml

@@ -1,16 +1,9 @@
-# Deploys a reflex site
-name: Deploy Site
+name: Deploy Reflex Site
 
 on:
   push:
     branches:
       - main
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: "Branch to deploy"
-        required: true
-        default: "main"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -25,80 +18,21 @@ jobs:
       contents: read
 
     steps:
-      - name: Check variables set
-        # Make it easier to see when environment setup is incorrect
-        run: |
-          if [ -z "${{ secrets.SSH_PRIVATE_KEY }}" ]; then
-            echo "SSH_PRIVATE_KEY is not set"
-            exit 1
-          fi
-          if [ -z "${{ vars.DROPLET_IP }}" ]; then
-            echo "DROPLET_IP is not set"
-            exit 1
-          fi
-          if [ -z "${{ vars.SITE_NAME }}" ]; then
-            echo "SITE_NAME is not set"
-            exit 1
-          fi
-          if [ -z "${{ vars.DOMAIN }}" ]; then
-            echo "DOMAIN is not set"
-            exit 1
-          fi
-          if [ -z "${{ secrets.RECAPTCHA_SITE_KEY }}" ]; then
-            echo "RECAPTCHA_SITE_KEY is not set"
-            exit 1
-          fi
-          if [ -z "${{ secrets.RECAPTCHA_SECRET_KEY }}" ]; then
-            echo "RECAPTCHA_SECRET_KEY is not set"
-            exit 1
-          fi
-
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.branch || github.ref }}
 
-      - name: Set up uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          version: "latest"
-          # pyproject-file: "pyproject.toml"
-
-      - name: Create .env for frontend
+      - name: Create .env
         run: |
-          echo "DOMAIN=${{ vars.DOMAIN }}" >> .env
+          echo "DOMAIN=${{ vars.DOMAIN }}" > .env
           echo "RECAPTCHA_SITE_KEY=${{ secrets.RECAPTCHA_SITE_KEY }}" >> .env
           echo "RECAPTCHA_SECRET_KEY=${{ secrets.RECAPTCHA_SECRET_KEY }}" >> .env
 
-      - name: Build frontend
-        run: |
-          mkdir -p "tmp_frontend_zip"
-          mkdir -p "site"
-          uv run reflex export --frontend-only --zip-dest-dir "tmp_frontend_zip"
-          unzip -q tmp_frontend_zip/frontend.zip -d site/
-          rm -r "tmp_frontend_zip"
-
-      - name: Send frontend static files
-        uses: appleboy/[email protected]
+      - name: Deploy frontend
+        uses: TimChild/webserver-template/actions/deploy-reflex-frontend@main
         with:
-          host: ${{ vars.DROPLET_IP }}
-          username: webadmin
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          port: 22
-          source: ./site/
-          target: sites/${{ vars.SITE_NAME }}/static/
-          strip_components: 2
-          overwrite: true
-
-      - name: Update frontend files on server
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ vars.DROPLET_IP }}
-          username: webadmin
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          # Note: This script is present on the server from the webserver setup
-          script: |
-            ./scripts/webserver-update-static-files.sh
+          vps-ip: ${{ vars.VPS_IP }}
+          site-name: ${{ vars.SITE_NAME }}
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
       - name: Remove .env
         if: always()
@@ -110,76 +44,26 @@ jobs:
       name: production
     permissions:
       contents: read
-      packages: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.branch || github.ref }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set lower case owner name
-        shell: bash
-        run: |
-          echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
-        env:
-          OWNER: "${{ github.repository_owner }}"
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: backend.Dockerfile
-          push: true
-          tags: ghcr.io/${{ env.OWNER_LC }}/${{ vars.SITE_NAME }}-backend:latest
 
       - name: Create .env for backend
         run: |
           echo "DOMAIN=${{ vars.DOMAIN }}" >> .env
           echo "RECAPTCHA_SITE_KEY=${{ secrets.RECAPTCHA_SITE_KEY }}" >> .env
           echo "RECAPTCHA_SECRET_KEY=${{ secrets.RECAPTCHA_SECRET_KEY }}" >> .env
 
-      - name: Send .env file to server
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ vars.DROPLET_IP }}
-          username: webadmin
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          port: 22
-          source: .env
-          target: sites/${{ vars.SITE_NAME }}
-          overwrite: true
-
-      - name: Set .env permissions
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ vars.DROPLET_IP }}
-          username: webadmin
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            chmod 600 sites/${{ vars.SITE_NAME }}/.env
-
-      - name: Pull new backend image on server and restart updated container
-        uses: appleboy/[email protected]
+      - name: Deploy backend
+        uses: TimChild/webserver-template/actions/deploy-reflex-backend@main
+        permissions:
+          packages: write
         with:
-          host: ${{ vars.DROPLET_IP }}
-          username: webadmin
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            # Log in to GitHub Container Registry
-            echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin && \
-            docker pull ghcr.io/${{ env.OWNER_LC }}/${{ vars.SITE_NAME }}-backend:latest && \
-            docker compose up -d
+          vps-ip: ${{ vars.DROPLET_IP }}
+          site-name: ${{ vars.SITE_NAME }}
+          dotenv-path: .env
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
       - name: Remove .env
         if: always()

other-templates/github-workflows/deploy-static-site.template.yml

@@ -1,4 +1,4 @@
-name: Deploy Site
+name: Deploy Static Quarto Site
 
 on:
   push:
@@ -23,6 +23,9 @@ jobs:
       # NOTE: if the action fails to set up python or R environments correctly, you should be able to do that here before calling the action.
       # E.g., Make sure QUARTO_PYTHON points to a python with jupyter, pandas, plotly, etc. installed.
 
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Deploy site via template action
         uses: TimChild/webserver-template/actions/deploy-quarto-static-site@main
         with: