From 27a907433f0346116767231a86adc67ceec1f270 Mon Sep 17 00:00:00 2001 From: purian23 Date: Thu, 13 Nov 2025 19:40:16 -0500 Subject: [PATCH] Test Copr workflow update --- .github/workflows/copr-release.yml | 36 +++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/workflows/copr-release.yml b/.github/workflows/copr-release.yml index bbeca672..53a7f556 100644 --- a/.github/workflows/copr-release.yml +++ b/.github/workflows/copr-release.yml @@ -1,12 +1,19 @@ -name: DMS Copr Stable Release (Manual) +name: DMS Copr Stable Release on: + push: + tags: + - 'v*' workflow_dispatch: inputs: version: description: 'Versioning (e.g., 0.1.14, leave empty for latest release)' required: false default: '' + release: + description: 'Release number (e.g., 1, 2, 3 for hotfixes)' + required: false + default: '1' jobs: build-and-upload: @@ -19,7 +26,12 @@ jobs: - name: Determine version id: version run: | - if [ -n "${{ github.event.inputs.version }}" ]; then + # Check if triggered by tag push + if [ "${{ github.ref_type }}" = "tag" ]; then + VERSION="${{ github.ref_name }}" + VERSION="${VERSION#v}" + echo "Using tag version: $VERSION" + elif [ -n "${{ github.event.inputs.version }}" ]; then VERSION="${{ github.event.inputs.version }}" echo "Using manual version: $VERSION" else @@ -27,8 +39,14 @@ jobs: echo "Using latest release version: $VERSION" fi + RELEASE="${{ github.event.inputs.release }}" + if [ -z "$RELEASE" ]; then + RELEASE="1" + fi + echo "version=$VERSION" >> $GITHUB_OUTPUT - echo "✅ Building DMS stable version: $VERSION" + echo "release=$RELEASE" >> $GITHUB_OUTPUT + echo "✅ Building DMS stable version: $VERSION-$RELEASE" - name: Setup build environment run: | @@ -57,6 +75,7 @@ jobs: - name: Generate stable spec file run: | VERSION="${{ steps.version.outputs.version }}" + RELEASE="${{ steps.version.outputs.release }}" CHANGELOG_DATE="$(date '+%a %b %d %Y')" cat > ~/rpmbuild/SPECS/dms.spec <<'SPECEOF' @@ -68,7 +87,7 @@ jobs: Name: dms Version: %{version} - Release: 1%{?dist} + Release: RELEASE_PLACEHOLDER%{?dist} Summary: %{pkg_summary} License: MIT @@ -212,16 +231,17 @@ jobs: %{_bindir}/dgop %changelog - * CHANGELOG_DATE_PLACEHOLDER AvengeMedia - VERSION_PLACEHOLDER-1 + * CHANGELOG_DATE_PLACEHOLDER AvengeMedia - VERSION_PLACEHOLDER-RELEASE_PLACEHOLDER - Stable release VERSION_PLACEHOLDER - Built from GitHub release - Includes latest dms-cli and dgop binaries SPECEOF sed -i "s/VERSION_PLACEHOLDER/${VERSION}/g" ~/rpmbuild/SPECS/dms.spec + sed -i "s/RELEASE_PLACEHOLDER/${RELEASE}/g" ~/rpmbuild/SPECS/dms.spec sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" ~/rpmbuild/SPECS/dms.spec - - echo "✅ Spec file generated for v${VERSION}" + + echo "✅ Spec file generated for v${VERSION}-${RELEASE}" echo "" echo "=== Spec file preview ===" head -40 ~/rpmbuild/SPECS/dms.spec @@ -295,7 +315,7 @@ jobs: run: | echo "### 🎉 DMS Stable Build Summary" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - echo "- **Version:** ${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY + echo "- **Version:** ${{ steps.version.outputs.version }}-${{ steps.version.outputs.release }}" >> $GITHUB_STEP_SUMMARY echo "- **SRPM:** ${{ steps.build.outputs.srpm_name }}" >> $GITHUB_STEP_SUMMARY echo "- **Project:** https://copr.fedorainfracloud.org/coprs/avengemedia/dms/" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY