From a8d159d96b7344acccdc2b200eda660c75791335 Mon Sep 17 00:00:00 2001
From: Andrevich <47223721+1andrevich@users.noreply.github.com>
Date: Sun, 8 Dec 2024 13:18:43 +0400
Subject: [PATCH] Update build.yml

---
 .github/workflows/build.yml | 53 +++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dad93a7..cf2e8e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,6 @@ name: Build domains_all and ipsum
 
 on:
   workflow_dispatch: # Allows manual trigger of the workflow
-  ##push:
-    ##branches:
-     ## - main
   schedule:
     - cron: '0 0 */3 * *' # Runs every 3rd day at midnight UTC
 
@@ -28,34 +25,32 @@ jobs:
 
     - name: Prepare directories for build
       run: |
-        mkdir -p sum/input
-        mkdir -p sum/output
+        mkdir -p $GITHUB_WORKSPACE/sum/input
+        mkdir -p $GITHUB_WORKSPACE/sum/output
 
     - name: Run OONI Parser (ooni_domains.lst)
       run: python "src/step 5 ooni list/ooni_list.py"
 
-
-##Community.lst and Domains.lst are already in the sum/input folder
-
-    - name: Run Domain Sum Up script (domains_all.lst)
+    - name: Run Domain Sum Up script (domains_all.lst) ##Community.lst goes from root folder
       run: python "src/step 5 ooni list/domain_sum.py"
 
-
     - name: Run OONI Resolver script (ooni_ips.lst)
       run: python "src/step 5 ooni list/resolver_ooni.py"
 
-
     - name: Run Community Resolver script (ip_community.lst)
       run: python "src/step 5 ooni list/resolver_community.py"
 
-
-    - name: Run IP Sum (Temp) script (ips_all.lst)
+    - name: Run IP Sum (Temp) script (ips_all.lst) ##discord_ips.lst goes from root folder
       run: python "src/step 5 ooni list/ip_4files_sum.py"
 
-
     - name: Run IP Sum + ASN (Final) script (ipsum.lst)
       run: python "src/step 6 temp - summarization and ASN CIDRs.py"
 
+    - name: Verify ipsum.lst Output
+      run: |
+        echo "Checking for ipsum.lst in sum/output:"
+        ls -la $GITHUB_WORKSPACE/sum/output/
+        cat $GITHUB_WORKSPACE/sum/output/ipsum.lst || echo "ipsum.lst not found or empty"
 
     - name: Run Bird2 Converter script
       run: python "src/bird2_converter.py"
@@ -63,12 +58,12 @@ jobs:
     - name: Convert files to LF (Unix format)
       run: |
         sudo apt-get update && sudo apt-get install -y dos2unix
-        find . -type f -name "*.lst" -exec dos2unix {} +
+        find $GITHUB_WORKSPACE -type f -name "*.lst" -exec dos2unix {} +
         
     - name: Verify Output
       run: |
         echo "Files in sum/output after build:"
-        ls -la sum/output
+        ls -la $GITHUB_WORKSPACE/sum/output
 
     - name: Install Go
       uses: actions/setup-go@v4
@@ -77,19 +72,25 @@ jobs:
 
     - name: Prepare Xray-GeoIP
       run: |
-        mkdir -p src/xray-geoip
-        cp ./sum/output/ipsum.lst src/xray-geoip/ipsum.lst
-        cd src/xray-geoip
-        go run ./  # This assumes a valid `main.go` file exists in `xray-geoip`
-      working-directory: src/xray-geoip
-        
+        mkdir -p $GITHUB_WORKSPACE/src/xray-geoip
+        if [ -f $GITHUB_WORKSPACE/sum/output/ipsum.lst ]; then
+          cp $GITHUB_WORKSPACE/sum/output/ipsum.lst $GITHUB_WORKSPACE/src/xray-geoip/ipsum.lst
+        else
+          echo "Error: ipsum.lst not found!" && exit 1
+        fi
+        cd $GITHUB_WORKSPACE/src/xray-geoip
+        go run ./ 
+
     - name: Prepare Xray-Geosite
       run: |
-        mkdir -p src/xray-geosite/data
-        cp ./sum/output/domains_all.lst src/xray-geosite/data/refilter
-        cd src/xray-geosite
+        mkdir -p $GITHUB_WORKSPACE/src/xray-geosite/data
+        if [ -f $GITHUB_WORKSPACE/sum/output/domains_all.lst ]; then
+          cp $GITHUB_WORKSPACE/sum/output/domains_all.lst $GITHUB_WORKSPACE/src/xray-geosite/data/refilter
+        else
+          echo "Error: domains_all.lst not found!" && exit 1
+        fi
+        cd $GITHUB_WORKSPACE/src/xray-geosite
         go run ./ --exportlists=refilter --outputname=geosite.dat
-      working-directory: src/xray-geosite
       
     - name: Upload Build Artifacts
       uses: actions/upload-artifact@v4