From 2feb1cf64b1d7b80e59cafe366e0d59d09edf926 Mon Sep 17 00:00:00 2001
From: quydang <81231812+quydang04@users.noreply.github.com>
Date: Mon, 15 Jan 2024 10:14:11 +0700
Subject: [PATCH] Update demo.yml

---
 .github/workflows/demo.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
index 6c3d940e..9d6ba3e9 100644
--- a/.github/workflows/demo.yml
+++ b/.github/workflows/demo.yml
@@ -29,17 +29,24 @@ jobs:
           if [ "${{ matrix.platform }}" == "armv7" ] || [ "${{ matrix.platform }}" == "armv6" ]; then
             sudo apt install gcc-arm-linux-gnueabihf
           fi
+          
       - name: Build x-ui
         run: |
           export CGO_ENABLED=1
           export GOOS=linux
+          # Define Xray_URL before using it
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.7/"
           if [ "${{ matrix.platform }}" == "arm64" ]; then
             export GOARCH=arm64
             export CC=aarch64-linux-gnu-gcc
-          elif [ "${{ matrix.platform }}" == "armv7" ] || [ "${{ matrix.platform }}" == "armv6" ]; then
-            export GOARCH=arm
-            export GOARM=7
-            export CC=arm-linux-gnueabihf-gcc
+          elif [ "${{ matrix.platform }}" == "armv7" ]; then
+            wget ${Xray_URL}Xray-linux-arm32-v7a.zip
+            unzip Xray-linux-arm32-v7a.zip
+            rm -f Xray-linux-arm32-v7a.zip
+          elif [ "${{ matrix.platform }}" == "armv6" ]; then
+            wget ${Xray_URL}Xray-linux-arm32-v6.zip
+            unzip Xray-linux-arm32-v6.zip
+            rm -f Xray-linux-arm32-v6.zip
           else
             export GOARCH=${{ matrix.platform }}
           fi
@@ -54,7 +61,6 @@ jobs:
           cd x-ui/bin
           
           # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.7/"
           if [ "${{ matrix.platform }}" == "amd64" ]; then
             wget ${Xray_URL}Xray-linux-64.zip
             unzip Xray-linux-64.zip
@@ -63,14 +69,12 @@ jobs:
             wget ${Xray_URL}Xray-linux-arm64-v8a.zip
             unzip Xray-linux-arm64-v8a.zip
             rm -f Xray-linux-arm64-v8a.zip
-          elif [ "${{ matrix.platform }}" == "armv7" ]; then
+          elif [ "${{ matrix.platform }}" == "armv7" ] || [ "${{ matrix.platform }}" == "armv6" ]; then
             wget ${Xray_URL}Xray-linux-arm32-v7a.zip
             unzip Xray-linux-arm32-v7a.zip
             rm -f Xray-linux-arm32-v7a.zip
-          elif [ "${{ matrix.platform }}" == "armv6" ]; then
-            wget ${Xray_URL}Xray-linux-arm32-v6.zip
-            unzip Xray-linux-arm32-v6.zip
-            rm -f Xray-linux-arm32-v6.zip
+            # Rename the executable to xray-linux-arm for armv7 and armv6
+            mv xray xray-linux-arm
           else
             wget ${Xray_URL}Xray-linux-${{ matrix.platform }}.zip
             unzip Xray-linux-${{ matrix.platform }}.zip
@@ -83,7 +87,6 @@ jobs:
           wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
           wget -O geoip_VN.dat https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geoip.dat
           wget -O geosite_VN.dat https://github.com/vuong2023/vn-v2ray-rules/releases/latest/download/geosite.dat
-          mv xray xray-linux-arm
           cd ../..
           
       - name: Package