From aa221e3382800a5d1d0f6240ccdbdc9050aa80af Mon Sep 17 00:00:00 2001
From: Keannu Bernasol <noehbernasol0@gmail.com>
Date: Thu, 27 Mar 2025 03:35:06 +0800
Subject: [PATCH] Update .yml files

---
 .woodpecker/.build.yml  | 19 ++++++++++---------
 .woodpecker/.deploy.yml | 29 +++++++++++++++--------------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 341a2d2..24bd67b 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -4,15 +4,6 @@ labels:
 steps:
   - name: build
     image: docker
-    when:
-      - branch: master
-        event: push
-    commands:
-      - docker build -t "$REGISTRY_IMAGE_TAG" .
-      - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME"
-      - docker push "$REGISTRY_IMAGE_TAG"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     environment:
       FORGEJO_REGISTRY_URL:
         from_secret: FORGEJO_REGISTRY_URL
@@ -22,3 +13,13 @@ steps:
         from_secret: FORGEJO_REGISTRY_PASSWORD
       REGISTRY_IMAGE_TAG:
         from_secret: REGISTRY_IMAGE_TAG
+    commands:
+      - docker build -t "$REGISTRY_IMAGE_TAG" .
+      - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME"
+      - docker push "$REGISTRY_IMAGE_TAG"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+
+when:
+  - branch: master
+    event: push
diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml
index 49d02f7..201bcd4 100644
--- a/.woodpecker/.deploy.yml
+++ b/.woodpecker/.deploy.yml
@@ -1,9 +1,17 @@
 steps:
   - name: deploy
     image: alpine:3.20
-    when:
-      - branch: master
-        event: push
+    environment:
+      SSH_HOST:
+        from_secret: SSH_HOST
+      PROJECT_DIRECTORY:
+        from_secret: PROJECT_DIRECTORY
+      WOODPECKER_SSH_KEY:
+        from_secret: WOODPECKER_SSH_KEY
+      REGISTRY_IMAGE_TAG:
+        from_secret: REGISTRY_IMAGE_TAG
+      DOCKER_DB_VOLUME:
+        from_secret: DOCKER_DB_VOLUME
     commands:
       - apk add openssh
       - mkdir -p /root/.ssh/
@@ -18,17 +26,10 @@ steps:
         docker pull "$REGISTRY_IMAGE_TAG";
         docker-compose up -d;
         docker image prune -af;"
-    environment:
-      SSH_HOST:
-        from_secret: SSH_HOST
-      PROJECT_DIRECTORY:
-        from_secret: PROJECT_DIRECTORY
-      WOODPECKER_SSH_KEY:
-        from_secret: WOODPECKER_SSH_KEY
-      REGISTRY_IMAGE_TAG:
-        from_secret: REGISTRY_IMAGE_TAG
-      DOCKER_DB_VOLUME:
-        from_secret: DOCKER_DB_VOLUME
+
+when:
+  - branch: master
+    event: push
 
 depends_on:
   - build