From 99ae7c2e79dc7e3e8dbbeef4e49621a3958f37f3 Mon Sep 17 00:00:00 2001
From: minoplhy <c@3qx.nl>
Date: Fri, 11 Oct 2024 01:07:21 +0700
Subject: [PATCH] re-push after clean up mess up

---
 .github/workflows/freenginx-build.yaml | 12 ++++--------
 .github/workflows/nginx-build.yaml     | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/freenginx-build.yaml b/.github/workflows/freenginx-build.yaml
index 025a1e3..d2cc137 100644
--- a/.github/workflows/freenginx-build.yaml
+++ b/.github/workflows/freenginx-build.yaml
@@ -19,6 +19,9 @@ jobs:
           echo "NGINX_TAG=${NGINX_TAG}" >> $GITHUB_ENV
           echo "NGINX_TAG=${NGINX_TAG}"
 
+      - name: Run freenginx Builds
+        run: |
+          #!/bin/bash
           TAGS=("vanilla" "allstar" "lua" "modsecurity")
           OPTIONS=(
             "--type=freenginx"
@@ -27,15 +30,8 @@ jobs:
             "--modsecurity --type=freenginx"
           )
           
-          echo "TAGS=${TAGS[*]}" >> $GITHUB_ENV
-          echo "OPTIONS=${OPTIONS[*]}" >> $GITHUB_ENV
-      - name: Run freenginx Builds
-        run: |
-          #!/bin/bash
-          
-          echo "This Task will be run using the following tag: ${NGINX_TAG}"
-          
           for i in ${!TAGS[@]}; do
+            echo "This Task will be run using the following tag: ${NGINX_TAG}"
             echo "This Task will be run using the following version: ${TAGS[$i]}"
             echo "This Task will be run using the following options: ${OPTIONS[$i]}"
 
diff --git a/.github/workflows/nginx-build.yaml b/.github/workflows/nginx-build.yaml
index c09cf23..832af41 100644
--- a/.github/workflows/nginx-build.yaml
+++ b/.github/workflows/nginx-build.yaml
@@ -19,20 +19,21 @@ jobs:
           echo "NGINX_TAG=${NGINX_TAG}" >> $GITHUB_ENV
           echo "NGINX_TAG=${NGINX_TAG}"
 
-          TAGS=("vanilla" "allstar" "lua" "modsecurity")
-          OPTIONS=(
-            "--type=nginx"
-            "--lua --modsecurity --type=nginx"
-            "--lua --type=nginx"
-            "--modsecurity --type=nginx"
-          )
-          
-          echo "TAGS=${TAGS[*]}" >> $GITHUB_ENV
-          echo "OPTIONS=${OPTIONS[*]}" >> $GITHUB_ENV
       - name: Run nginx Builds
         run: |
+          TAGS=("vanilla" "allstar" "lua" "modsecurity")
+          OPTIONS=(
+            "--type=freenginx"
+            "--lua --modsecurity --type=freenginx"
+            "--lua --type=freenginx"
+            "--modsecurity --type=freenginx"
+          )
+
           for i in ${!TAGS[@]}; do
             echo "This Task will be run using the following tag: ${NGINX_TAG}"
+            echo "This Task will be run using the following version: ${TAGS[$i]}"
+            echo "This Task will be run using the following options: ${OPTIONS[$i]}"
+            
             curl https://raw.githubusercontent.com/minoplhy/scriptbox/main/nginx_build_script/build.sh | bash -s -- --nginx-tag=${NGINX_TAG} ${OPTIONS[$i]}
           
             # Prepare tar file paths