From 80989d32bcaf35b0d2a58d8616c2bdce0537581c Mon Sep 17 00:00:00 2001
From: robojerk <rraines@gmail.com>
Date: Tue, 19 Aug 2025 12:08:36 -0700
Subject: [PATCH] feat: try FORGEJO_RUN_NUMBER for CI build identification

- Add FORGEJO_RUN_NUMBER to environment variable debugging
- Update versioning logic to prioritize FORGEJO_RUN_NUMBER over GITEA_RUN_NUMBER
- Implement fallback chain: FORGEJO_RUN_NUMBER -> GITEA_RUN_NUMBER -> timestamp
- Enhanced debug output to show which CI build number source is being used
- Expected result: apt-ostree_0.1.0-2+build109.15b981d38f_amd64.deb (when CI number available)
---
 .forgejo/workflows/ci.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index d1e0bbcd..9ced7346 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -31,6 +31,7 @@ jobs:
 
           echo ""
           echo "Available environment variables:"
+          echo "FORGEJO_RUN_NUMBER: ${FORGEJO_RUN_NUMBER:-'NOT_SET'}"
           echo "GITEA_RUN_NUMBER: ${GITEA_RUN_NUMBER:-'NOT_SET'}"
           echo "ACTIONS_RUN_NUMBER: ${ACTIONS_RUN_NUMBER:-'NOT_SET'}"
           echo "GITHUB_RUN_NUMBER: ${GITHUB_RUN_NUMBER:-'NOT_SET'}"
@@ -123,8 +124,8 @@ jobs:
           echo "Building Debian package..."
 
           # Get build information for versioning
-          # Gitea/Forgejo Actions uses GITEA_RUN_NUMBER, fallback to timestamp for now
-          BUILD_NUMBER="${GITEA_RUN_NUMBER:-$(date +%Y%m%d%H%M%S)}"
+          # Forgejo Actions uses FORGEJO_RUN_NUMBER, fallback to GITEA_RUN_NUMBER, then timestamp
+          BUILD_NUMBER="${FORGEJO_RUN_NUMBER:-${GITEA_RUN_NUMBER:-$(date +%Y%m%d%H%M%S)}}"
           COMMIT_HASH=$(git rev-parse HEAD 2>/dev/null || echo "unknown")
 
           # Truncate commit hash to first 10 characters for better readability
@@ -176,10 +177,12 @@ jobs:
           echo "Commit Hash: $SHORT_COMMIT"
           
           # Debug information about build number source
-          if [ -n "$GITEA_RUN_NUMBER" ]; then
-            echo "✅ Using CI build number: $GITEA_RUN_NUMBER"
+          if [ -n "$FORGEJO_RUN_NUMBER" ]; then
+            echo "✅ Using Forgejo CI build number: $FORGEJO_RUN_NUMBER"
+          elif [ -n "$GITEA_RUN_NUMBER" ]; then
+            echo "✅ Using Gitea CI build number: $GITEA_RUN_NUMBER"
           else
-            echo "⚠️ GITEA_RUN_NUMBER not set, using timestamp fallback: $(date +%Y%m%d%H%M%S)"
+            echo "⚠️ No CI build number available, using timestamp fallback: $(date +%Y%m%d%H%M%S)"
           fi
 
           # Check if we have the necessary files
@@ -520,8 +523,8 @@ jobs:
           fi
 
           # Get build info for registry
-          # Gitea/Forgejo Actions uses GITEA_RUN_NUMBER, fallback to timestamp for now
-          BUILD_NUMBER="${GITEA_RUN_NUMBER:-$(date +%Y%m%d%H%M%S)}"
+          # Forgejo Actions uses FORGEJO_RUN_NUMBER, fallback to GITEA_RUN_NUMBER, then timestamp
+          BUILD_NUMBER="${FORGEJO_RUN_NUMBER:-${GITEA_RUN_NUMBER:-$(date +%Y%m%d%H%M%S)}}"
           COMMIT_HASH=$(git rev-parse HEAD 2>/dev/null || echo "unknown")
 
           echo "Publishing packages for build $BUILD_NUMBER (commit $COMMIT_HASH)"