update flows

Author: AmarBego

.github/workflows/build.yml

@@ -133,9 +133,8 @@ jobs:
 
       - name: Setup xbps-src
         run: |
-          ls -R ../vup
           cd void-packages
-          cp ../vup/vup/xbps-src .
+          cp ../vup/xbps-src .
           chmod +x xbps-src
           echo "XBPS_ALLOW_RESTRICTED=yes" >> etc/conf
 
@@ -153,7 +152,7 @@ jobs:
         run: |
           mkdir -p void-packages/dist
           cd void-packages/dist
-          python3 ../../vup/vup/scripts/manage_release.py download
+          python3 ../vup/scripts/manage_release.py download
           rm -f repodata
 
       - name: Build Packages (Buffered)
@@ -162,14 +161,14 @@ jobs:
         run: |
           cd void-packages
           # category is passed via env
-          python3 ../vup/vup/scripts/build_runner.py
+          python3 ../vup/scripts/build_runner.py
 
       - name: Prune and Index
         env:
           XBPS_PRIVATE_KEY: ${{ secrets.XBPS_PRIVATE_KEY }}
         run: |
           cd void-packages/dist
-          python3 ../../vup/vup/scripts/manage_release.py prune
+          python3 ../vup/scripts/manage_release.py prune
           
           if [ ! -z "$XBPS_PRIVATE_KEY" ]; then
              echo "$XBPS_PRIVATE_KEY" > ../privkey.pem
@@ -197,7 +196,7 @@ jobs:
           CATEGORY: ${{ matrix.category }}
         run: |
           cd void-packages/dist
-          python3 ../../vup/vup/scripts/manage_release.py clean_remote
+          python3 ../vup/scripts/manage_release.py clean_remote
 
       - name: Upload New Assets
         env:

.github/workflows/pr-check.yml

@@ -95,7 +95,7 @@ jobs:
         run: |
           cd void-packages
           # Override xbps-src with our custom version
-          cp ../vup/vup/xbps-src .
+          cp ../vup/xbps-src .
           chmod +x xbps-src
           
           # Authorize restricted packages
@@ -111,7 +111,7 @@ jobs:
         if: steps.check_changes.outputs.skip != 'true'
         run: |
           cd void-packages
-          CATEGORY_PATH="../vup/vup/srcpkgs/${{ matrix.category }}"
+          CATEGORY_PATH="../vup/srcpkgs/${{ matrix.category }}"
           
           # Re-detect changed packages to iterate specifically over them
           # Or just build everything in the category that is present? 

.github/workflows/vuru-release.yml

@@ -54,7 +54,7 @@ jobs:
           echo "Updating template to version $VERSION with checksum $CHECKSUM"
           
           # NOTE: 'vup' is the checkout directory, 'vup/srcpkgs' is inside the repo
-          TEMPLATE="vup/vup/srcpkgs/core/vuru/template"
+          TEMPLATE="vup/srcpkgs/core/vuru/template"
           
           sed -i "s/^version=.*/version=$VERSION/" "$TEMPLATE"
           sed -i "s/^checksum=.*/checksum=\"$CHECKSUM\"/" "$TEMPLATE"

vup/scripts/build_runner.py

@@ -42,7 +42,7 @@ def main():
 
     # Assumes we are running from 'void-packages' directory
     # and vup checkout is at '../vup'
-    vup_src_path = f"../vup/vup/srcpkgs/{category}"
+    vup_src_path = f"../vup/srcpkgs/{category}"
 
     if not os.path.exists(vup_src_path):
         print(f"Category path {vup_src_path} does not exist.")