fix variables

Author: artcz

.github/workflows/preview.yml

@@ -27,6 +27,9 @@ jobs:
           BRANCH_NAME=$(make safe_branch)
           echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
 
+      - name: ssh keyscan
+        run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
+
       - name: Upload preview
         run: make preview
 

Makefile

@@ -4,7 +4,7 @@
 VPS_USER  ?= static_content_user
 VPS_HOST  ?= static.europython.eu
 VPS_PROD_PATH  ?= /home/static_content_user/content/europython_websites/ep2025
-VPS_PREVIEW_PATH  ?= /home/static_content_user/content/previews/
+VPS_PREVIEW_PATH  ?= /home/static_content_user/content/previews
 REMOTE_CMD=ssh $(VPS_USER)@$(VPS_HOST)
 
 # Variables for build/deploy
@@ -47,22 +47,24 @@ build:
 	# NOTE: also let's find a better way to do this :D
 	find ./dist/_astro/ -iname '*.jpg' -delete
 
+preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
+preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
+preview:
+	echo $(TARGET)
+	@echo "\n\n**** Deploying preview of a 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**** Preview complete.\n\n"
+
+
 ifeq ($(FORCE_DEPLOY), true)
+deploy: RELEASES_DIR = $(VPS_PROD_PATH)/$(SAFE_BRANCH)/releases
+deploy: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
 deploy:
-	RELEASES_DIR := $(VPS_PROD_PATH)/releases
-	TARGET := $(RELEASES_DIR)/$(TIMESTAMP)
 	@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"
 endif
-
-preview:
-	RELEASES_DIR := $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
-	TARGET := $(RELEASES_DIR)/$(TIMESTAMP)
-	@echo "\n\n**** Deploying preview of a 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**** Preview complete.\n\n"