Add build step to environment setup

.github/workflows/build-deploy.yml

@@ -33,9 +33,6 @@ jobs:
       - name: Install dependencies
         run: make install
 
-      - name: Build the website
-        run: make build MODE=production
-
       - name: Set up SSH key
         uses: webfactory/[email protected]
         with:
@@ -44,5 +41,7 @@ jobs:
       - name: ssh keyscan
         run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
 
-      - name: Deploy to server
+      - name: Build and Deploy to server
+        env:
+          MODE: "production"
         run: make deploy FORCE_DEPLOY=true

.github/workflows/preview.yml

@@ -36,13 +36,6 @@ jobs:
       - name: Install dependencies
         run: make install
 
-      - name: Build the website
-        env:
-          BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
-          GIT_VERSION: "${{ env.GITHUB_COMMIT_HASH }}"
-          MODE: "preview"
-        run: make build
-
       - name: Set up SSH key
         uses: webfactory/[email protected]
         with:
@@ -51,9 +44,11 @@ jobs:
       - name: ssh keyscan
         run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
 
-      - name: Upload preview
+      - name: Build and upload preview
         env:
           BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
+          GIT_VERSION: "${{ env.GITHUB_COMMIT_HASH }}"
+          MODE: "preview"
         run: make preview
 
       - name: Get safe branch and export to env

Makefile

@@ -48,6 +48,7 @@ build:
 
 preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
 preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
+preview: build
 preview:
 	@echo "Preview site URL: $(PREVIEW_SITE_URL)"
 	echo $(TARGET)
@@ -72,6 +73,7 @@ ls -1dt */ \
 ifeq ($(FORCE_DEPLOY), true)
 deploy: RELEASES_DIR = $(VPS_PROD_PATH)/releases
 deploy: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
+deploy: build
 deploy:
 	@echo "\n\n**** Deploying branch '$(BRANCH)' (safe: $(SAFE_BRANCH)) to $(TARGET)...\n\n"
 	$(REMOTE_CMD) "mkdir -p $(TARGET)"