test simpler deployment

Author: artcz

.github/workflows/build-deploy.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - ep2024
       - ep2025
+      - deployment-simpler
 
 jobs:
   deploy:
@@ -27,28 +28,15 @@ jobs:
           cache: "pnpm"
 
       - name: Install dependencies
-        run: pnpm install
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          cache: "pip"
-
-      - name: Install Ansible
-        run: pip install ansible
+        run: make install
 
       - name: Build the website
-        run: pnpm build
+        run: make build
 
       - name: Set up SSH key
         uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
 
       - name: Deploy to server
-        env:
-          SSH_USERNAME: ${{ secrets.DEPLOY_SSH_USERNAME }}
-          INVENTORY: ${{ secrets.DEPLOY_INVENTORY }}
-        run: |
-          ansible-playbook -u $SSH_USERNAME -i "$INVENTORY" deploy.yml
+        run: make deploy

Makefile

@@ -1,6 +1,36 @@
+#
+# Variables for remote host
+# =========================
+VPS_USER  ?= static_content_user
+VPS_HOST  ?= static.europython.eu
+VPS_PROD_PATH  ?= /home/static_content_user/content/europython_websites/ep2025test
+VPS_PREVIEW_PATH  ?= /home/static_content_user/content/europython_websites/previews/
+REMOTE_CMD=ssh $(VPS_USER)@$(VPS_HOST)
+
+# Variables for build/deploy
+# ==========================
+export TIMESTAMP := $(shell date +%Y%m%d%H%M%S)
+export GIT_VERSION := $(shell git rev-parse --short HEAD)
+
+# Variables for deploy
+# ====================
+# Auto-detect and sanitize current git branch
+BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+# Replace "/" and other non-alphanumeric characters with "-"
+SAFE_BRANCH := $(shell echo "$(BRANCH)" | sed 's/[^A-Za-z0-9._-]/-/g')
+
+# TODO: update this to the prod branches
+ifeq ($(SAFE_BRANCH), deployment-simpler)
+	RELEASES_DIR := $(VPS_PATH)/releases
+else
+	RELEASES_DIR := $(VPS_PATH)/preview/$(SAFE_BRANCH)/releases
+endif
+
+TARGET := $(RELEASES_DIR)/$(TIMESTAMP)
+
+.PHONY: build deploy dev clean install
+
 pre:
-	python -m pip install pre-commit ansible
-	pre-commit install
 	npm install -g pnpm
 
 install:
@@ -9,17 +39,16 @@ install:
 dev:
 	pnpm dev
 
-build:
-	pnpm build
-
-deploy:
-	$(if $(findstring Windows_NT, $(OS)), \
-		$(error Deployment is not supported on Windows. Use WSL or a Unix-like system.), \
-		@read -p "Enter SSH username: " USERNAME; \
-		read -p "Enter inline inventory (e.g., 'host1,' (DO NOT forget the trailing comma)): " INVENTORY; \
-		ansible-playbook -u $$USERNAME -i "$$INVENTORY" deploy.yml)
-
 clean:
 	git clean -fdX
 
-.PHONY: pre install dev build deploy clean
+build:
+	# TODO: update this to just `pnpm build` after resolving the astro-check warnings
+	pnpm run astro build
+
+deploy:
+	@echo "\n\n**** Deploying branch '$(BRANCH)' (safe: $(SAFE_BRANCH)) to $(TARGET)...\n\n"
+	$(REMOTE_CMD) "mkdir -p $(TARGET)"
+	rsync -avz --delete ./dist/ $(VPS_USER)@$(VPS_HOST):$(TARGET)/
+	$(REMOTE_CMD) "cd $(RELEASES_DIR) && ln -snf $(TIMESTAMP) current"
+	@echo "\n\n**** Deployment complete.\n\n"

deploy.yml

@@ -3,6 +3,9 @@ import { Fullbleed } from "./layout/fullbleed";
 
 import links from "../data/links.json";
 import { EPSLogo } from "./logo/eps-logo";
+
+const buildTimestamp = import.meta.env.TIMESTAMP;
+const gitVersion = import.meta.env.GIT_VERSION;
 ---
 
 <Fullbleed className="bg-primary text-white">
@@ -89,5 +92,7 @@ import { EPSLogo } from "./logo/eps-logo";
         </p>
       </div>
     </article>
+
+    <p>version: {gitVersion} @ {buildTimestamp}</p>
   </footer>
 </Fullbleed>