fix: version workflow

Author: d-led

.github/workflows/publish-conan.yml

@@ -4,10 +4,42 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
+    inputs:
+      publish:
+        description: 'Publish to Conan Center (must be set to "true")'
+        required: true
+        type: boolean
+        default: false
 
 jobs:
-  publish:
+  extract-version:
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      tag: ${{ steps.version.outputs.tag }}
+    steps:
+    - name: Extract version from tag
+      id: version
+      run: |
+        if [ "${{ github.event_name }}" = "push" ]; then
+          TAG=${GITHUB_REF#refs/tags/}
+          VERSION=${TAG#v}
+        else
+          # For workflow_dispatch, use the tag input or default
+          TAG=${GITHUB_REF#refs/tags/}
+          VERSION=${TAG#v}
+        fi
+        echo "version=${VERSION}" >> $GITHUB_OUTPUT
+        echo "tag=${TAG}" >> $GITHUB_OUTPUT
+        echo "Tag: ${TAG}, Version: ${VERSION}"
+
+  publish-conan:
+    needs: extract-version
+    runs-on: ubuntu-latest
+    if: |
+      (github.event_name == 'workflow_dispatch' && inputs.publish == true) ||
+      (github.event_name == 'push' && vars.PUBLISH_TO_CONAN == 'true')
     permissions:
       contents: write
       pull-requests: write
@@ -18,13 +50,6 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Extract version from tag
-      id: version
-      run: |
-        VERSION=${GITHUB_REF#refs/tags/v}
-        echo "version=${VERSION}" >> $GITHUB_OUTPUT
-        echo "Tag: ${GITHUB_REF}, Version: ${VERSION}"
-    
     - name: Setup Git
       run: |
         git config --global user.name "github-actions[bot]"
@@ -54,5 +79,62 @@ jobs:
         CONAN_INDEX_DIR: ${{ github.workspace }}/conan-center-index
         GITHUB_TOKEN: ${{ secrets.CONAN_INDEX_PAT || secrets.GITHUB_TOKEN }}
       run: |
-        ./scripts/publish-conan-version.sh "${{ steps.version.outputs.version }}"
+        ./scripts/publish-conan-version.sh "${{ needs.extract-version.outputs.version }}"
+
+  create-release:
+    needs: extract-version
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    permissions:
+      contents: write
+    
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    
+    - name: Generate release notes
+      id: release_notes
+      run: |
+        TAG="${{ needs.extract-version.outputs.tag }}"
+        VERSION="${{ needs.extract-version.outputs.version }}"
+        
+        # Try to extract release notes from CHANGELOG.md if it exists
+        if [ -f CHANGELOG.md ]; then
+          # Extract section for this version (format: ## [version] or ## [version] - date)
+          # Use awk to extract from the version heading until the next ## heading or --- separator
+          RELEASE_NOTES=$(awk -v version="${VERSION}" '
+            BEGIN { in_section = 0 }
+            /^## \[/ { 
+              if (in_section) exit
+              if ($0 ~ "\\[" version "\\]") in_section = 1
+            }
+            /^---$/ { if (in_section) exit }
+            in_section { print }
+          ' CHANGELOG.md)
+        else
+          RELEASE_NOTES=""
+        fi
+        
+        # If no notes found, create a simple one
+        if [ -z "$RELEASE_NOTES" ]; then
+          RELEASE_NOTES="## Release ${VERSION}
+
+This release includes the latest changes and improvements."
+        fi
+        
+        # Use multiline output
+        echo "notes<<EOF" >> $GITHUB_OUTPUT
+        echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+    
+    - name: Create GitHub Release
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: ${{ needs.extract-version.outputs.tag }}
+        name: Release ${{ needs.extract-version.outputs.version }}
+        body: ${{ steps.release_notes.outputs.notes }}
+        draft: false
+        prerelease: ${{ contains(needs.extract-version.outputs.version, '-rc') || contains(needs.extract-version.outputs.version, '-alpha') || contains(needs.extract-version.outputs.version, '-beta') }}
 

scripts/publish-conan-version.sh

@@ -81,6 +81,9 @@ else
     cd "${CONAN_INDEX_DIR}"
     if [ "${DRY_RUN}" != true ]; then
         git fetch upstream master
+        git fetch origin master 2>/dev/null || true
+        # We merge upstream to get latest recipe structure, but create branches from origin/master
+        # to avoid including workflow changes that require 'workflow' scope
         git checkout master 2>/dev/null || git checkout -b master
         git merge upstream/master || true
     fi
@@ -274,7 +277,14 @@ fi
 
 # Create branch and commit
 echo "Creating branch and committing..."
-git checkout -b "${BRANCH_NAME}" 2>/dev/null || git checkout "${BRANCH_NAME}"
+# Create branch from origin/master (fork's state) to avoid including workflow changes from merge
+# This prevents requiring 'workflow' scope when pushing
+if git show origin/master >/dev/null 2>&1; then
+    git checkout -b "${BRANCH_NAME}" origin/master 2>/dev/null || git checkout "${BRANCH_NAME}"
+else
+    # Fallback: create from current branch if origin/master doesn't exist
+    git checkout -b "${BRANCH_NAME}" 2>/dev/null || git checkout "${BRANCH_NAME}"
+fi
 git add "${RECIPE_DIR}/"
 git commit -m "Add influxdb-cpp-rest/${VERSION}