particle-os/apt-ostree
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat: try FORGEJO_RUN_NUMBER for CI build identification
Some checks failed
Comprehensive CI/CD Pipeline / Build and Test (push) Successful in 8m10s
Details
Comprehensive CI/CD Pipeline / Security Audit (push) Failing after 6s
Details
Comprehensive CI/CD Pipeline / Package Validation (push) Successful in 2m0s
Details
Comprehensive CI/CD Pipeline / Status Report (push) Has been skipped
Details

Browse source 
- 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)
This commit is contained in:
robojerk 2025-08-19 12:08:36 -07:00
parent 15b981d38f
commit 80989d32bc
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.forgejo/workflows/ci.yml
View file

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