From 2e180ec649cb74d8e1eb8d21476dfd42a7d6da1d Mon Sep 17 00:00:00 2001
From: robojerk <rraines@gmail.com>
Date: Mon, 21 Jul 2025 18:17:23 +0000
Subject: [PATCH] Improve workflow with confirmed working Basic Auth method

---
 .../workflows/build-libostree-backport.yml    | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/.forgejo/workflows/build-libostree-backport.yml b/.forgejo/workflows/build-libostree-backport.yml
index b5f07ca..ff81762 100644
--- a/.forgejo/workflows/build-libostree-backport.yml
+++ b/.forgejo/workflows/build-libostree-backport.yml
@@ -252,21 +252,17 @@ jobs:
         run: |
           echo "=== Attempting Debian Package Registry upload with ACCESS_TOKEN ==="
           
-          # Upload each .deb package to Forgejo's Debian Package Registry
           for deb_file in release-assets/*.deb; do
             if [ -f "$deb_file" ]; then
               echo "Uploading $deb_file to Debian Package Registry..."
-              
-              # Extract filename for the package
               filename=$(basename "$deb_file")
-              
               echo "File: $filename"
               
-              # Upload to Forgejo's Debian Package Registry using Basic Auth
-              # PUT https://forgejo.example.com/api/packages/{owner}/debian/pool/{distribution}/{component}/upload
-              response=$(curl -s -w "%{http_code}" --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \
-                   --upload-file "$deb_file" \
-                   "https://git.raines.xyz/api/packages/robojerk/debian/pool/noble/main/upload")
+              # Use the confirmed working Basic Auth method
+              response=$(curl -s -w "%{http_code}" \
+                               --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \
+                               --upload-file "$deb_file" \
+                               "https://git.raines.xyz/api/packages/robojerk/debian/pool/noble/main/upload")
               
               http_code=$(echo "$response" | tail -c 4)
               echo "HTTP Response Code: $http_code"
@@ -283,12 +279,9 @@ jobs:
         run: |
           echo "=== Attempting Generic Package Registry upload (fallback) with ACCESS_TOKEN ==="
           
-          # Upload each .deb package to Forgejo's Generic Package Registry
           for deb_file in release-assets/*.deb; do
             if [ -f "$deb_file" ]; then
               echo "Uploading $deb_file to Generic Package Registry..."
-              
-              # Extract filename for the package
               filename=$(basename "$deb_file")
               package_name=$(echo "$filename" | cut -d'_' -f1)
               version=$(echo "$filename" | cut -d'_' -f2 | cut -d'~' -f1)
@@ -297,11 +290,11 @@ jobs:
               echo "Version: $version"
               echo "File: $filename"
               
-              # Upload to Forgejo's Generic Package Registry using Basic Auth
-              # PUT https://forgejo.example.com/api/packages/{owner}/generic/{package_name}/{package_version}/{file_name}
-              response=$(curl -s -w "%{http_code}" --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \
-                   --upload-file "$deb_file" \
-                   "https://git.raines.xyz/api/packages/robojerk/generic/$package_name/$version/$filename")
+              # Use the confirmed working Basic Auth method
+              response=$(curl -s -w "%{http_code}" \
+                               --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \
+                               --upload-file "$deb_file" \
+                               "https://git.raines.xyz/api/packages/robojerk/generic/$package_name/$version/$filename")
               
               http_code=$(echo "$response" | tail -c 4)
               echo "HTTP Response Code: $http_code"