From c964df3fbea7faeef8ffa53fb9a5fedcc0f85932 Mon Sep 17 00:00:00 2001
From: bdeshi <bdeshi@bdeshi.space>
Date: Thu, 20 Feb 2025 19:18:50 +0600
Subject: [PATCH] update build pipeline

---
 .woodpecker/{cd.yml => build.yml} | 47 ++++++++++++++++---------------
 1 file changed, 25 insertions(+), 22 deletions(-)
 rename .woodpecker/{cd.yml => build.yml} (72%)

diff --git a/.woodpecker/cd.yml b/.woodpecker/build.yml
similarity index 72%
rename from .woodpecker/cd.yml
rename to .woodpecker/build.yml
index 58fad78..842add0 100644
--- a/.woodpecker/cd.yml
+++ b/.woodpecker/build.yml
@@ -11,39 +11,40 @@ variables:
     - &image_aws_cli amazon/aws-cli:2.15.50
     - &image_drone_cache meltwater/drone-cache:v1.4.0
 
-  deploy_secrets: &deploy_secrets
-    - S3_BUCKET
-    - CLOUDFRONT_DISTRIBUTION
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
-    - AWS_REGION
-
-  cache_step: &cache_step
-    image: *image_drone_cache
-    environment:
-      AWS_ACCESS_KEY_ID:
-        from_secret: CACHE_S3_ACCESS_KEY_ID
-      AWS_SECRET_ACCESS_KEY:
-        from_secret: CACHE_S3_SECRET_ACCESS_KEY
+  deploy_envs: &deploy_envs
+    S3_BUCKET:
+      from_secret: S3_BUCKET
+    CLOUDFRONT_DISTRIBUTION:
+      from_secret: CLOUDFRONT_DISTRIBUTION
+    AWS_ACCESS_KEY_ID:
+      from_secret: AWS_ACCESS_KEY_ID
+    AWS_SECRET_ACCESS_KEY:
+      from_secret: AWS_SECRET_ACCESS_KEY
+    AWS_REGION:
+      from_secret: AWS_REGION
 
   cache_settings: &cache_settings
-    cache_key: '{{ checksum "yarn.lock" }}'
-    archive_format: zstd
-    bucket:
-      from_secret: CACHE_S3_BUCKET
+    access-key:
+      from_secret: CACHE_S3_ACCESS_KEY_ID
+    secret-key:
+      from_secret: CACHE_S3_SECRET_ACCESS_KEY
     endpoint:
       from_secret: CACHE_S3_ENDPOINT
     region:
       from_secret: CACHE_S3_REGION
+    bucket:
+      from_secret: CACHE_S3_BUCKET
     path_style:
       from_secret: CACHE_S3_USE_PATH_STYLE
+    cache_key: '{{ checksum "yarn.lock" }}'
+    archive_format: zstd
     mount:
       - 'node_modules'
 
 steps:
 
   - name: cache/restore
-    <<: *cache_step
+    image: *image_drone_cache
     settings:
       <<: *cache_settings
       restore: true
@@ -58,7 +59,7 @@ steps:
 
   - name: cache/rebuild
     depends_on: [build/nodejs]
-    <<: *cache_step
+    image: *image_drone_cache
     settings:
       <<: *cache_settings
       rebuild: true
@@ -67,8 +68,9 @@ steps:
     depends_on: [build/nodejs]
     when:
       - branch: main
-    secrets: *deploy_secrets
     image: *image_aws_cli
+    environment:
+      <<: *deploy_envs
     commands:
       - aws s3 sync --delete ./dist "s3://$${S3_BUCKET}/"
 
@@ -76,8 +78,9 @@ steps:
     depends_on: [publish/s3]
     when:
       - branch: main
-    secrets: *deploy_secrets
     image: *image_aws_cli
+    environment:
+      <<: *deploy_envs
     commands:
       - aws cloudfront create-invalidation --distribution-id
         "$${CLOUDFRONT_DISTRIBUTION}" --paths '/*'