Update from upstream

.github/workflows/docker-image.yml

@@ -5,6 +5,19 @@ on:
     types:
       - published
   workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number (for PR builds)'
+        required: false
+        type: string
+      pr_ref:
+        description: 'PR branch ref (for PR builds)'
+        required: false
+        type: string
+      pr_sha:
+        description: 'PR SHA (for PR builds)'
+        required: false
+        type: string
 
 env:
   REGISTRY: ghcr.io
@@ -20,6 +33,42 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.pr_sha || github.sha }}
+          fetch-depth: 0
+
+      - name: Fetch PR if building for PR
+        if: inputs.pr_number
+        run: |
+          echo "Building for PR #${{ inputs.pr_number }}"
+          echo "PR SHA: ${{ inputs.pr_sha }}"
+          echo "PR Ref: ${{ inputs.pr_ref }}"
+
+          # Try to fetch the PR head directly (works for both forks and same-repo PRs)
+          if git fetch origin pull/${{ inputs.pr_number }}/head:pr-${{ inputs.pr_number }}; then
+            echo "✅ Successfully fetched PR via pull/${{ inputs.pr_number }}/head"
+            git checkout pr-${{ inputs.pr_number }}
+          else
+            echo "⚠️ Failed to fetch via pull/ ref, trying to checkout SHA directly"
+            # Fallback: try to checkout the SHA if it exists
+            if git checkout ${{ inputs.pr_sha }}; then
+              echo "✅ Successfully checked out SHA ${{ inputs.pr_sha }}"
+            else
+              echo "❌ Failed to checkout PR. Using current ref."
+              exit 1
+            fi
+          fi
+
+          # Verify we're on the right commit
+          CURRENT_SHA=$(git rev-parse HEAD)
+          echo "Current SHA: $CURRENT_SHA"
+          echo "Expected SHA: ${{ inputs.pr_sha }}"
+
+          if [ "$CURRENT_SHA" = "${{ inputs.pr_sha }}" ]; then
+            echo "✅ Successfully checked out correct commit"
+          else
+            echo "⚠️ Warning: Current SHA doesn't match expected SHA"
+          fi
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -44,6 +93,9 @@ jobs:
           if [ "${{ github.event_name }}" == "release" ]; then
             RELEASE_VERSION="${{ github.event.release.tag_name }}"
             echo "VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+          elif [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ -n "${{ inputs.pr_number }}" ]; then
+            PR_NUMBER="${{ inputs.pr_number }}"
+            echo "VERSION=pr-${PR_NUMBER}" >> $GITHUB_ENV
           elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
             BRANCH_NAME="${{ github.ref_name }}"
             echo "VERSION=${BRANCH_NAME}" >> $GITHUB_ENV
@@ -57,17 +109,15 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=tag
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}
-            ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:latest
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -76,10 +126,14 @@ jobs:
         run: |
           echo "✅ Docker images built and pushed successfully!"
           echo "🐋 Images:"
-          echo "  - ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:${{ env.VERSION }}"
-          echo "  - ${{ env.REGISTRY }}/${{ env.LOWER_CASE_REPO_NAME }}:latest"
+          echo "${{ steps.meta.outputs.tags }}" | sed 's/^/  - /'
+          echo "📝 Event: ${{ github.event_name }}"
           if [ "${{ github.event_name }}" == "release" ]; then
             echo "📝 Triggered by release: ${{ github.event.release.tag_name }}"
+          elif [ -n "${{ inputs.pr_number }}" ]; then
+            echo "📝 Triggered by comment on PR #${{ inputs.pr_number }}"
+            echo "📝 PR branch: ${{ inputs.pr_ref }}"
+            echo "📝 PR SHA: ${{ inputs.pr_sha }}"
           else
             echo "📝 Triggered by manual workflow dispatch on branch: ${{ github.ref_name }}"
           fi

.github/workflows/pr-build-comment.yml

@@ -0,0 +1,116 @@
+name: PR Build Comment Trigger
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  check-comment:
+    if: github.event.issue.pull_request && github.event.comment.user.login == 'Audionut' && contains(github.event.comment.body, '/build')
+    runs-on: ubuntu-latest
+    outputs:
+      should-build: ${{ steps.check.outputs.should-build }}
+      pr-number: ${{ steps.pr-info.outputs.pr-number }}
+      pr-ref: ${{ steps.pr-info.outputs.pr-ref }}
+      pr-sha: ${{ steps.pr-info.outputs.pr-sha }}
+      pr-repo: ${{ steps.pr-info.outputs.pr-repo }}
+
+    steps:
+      - name: Check comment and permissions
+        id: check
+        run: |
+          echo "Comment by: ${{ github.event.comment.user.login }}"
+          echo "Comment body: ${{ github.event.comment.body }}"
+          echo "should-build=true" >> $GITHUB_OUTPUT
+
+      - name: Get PR information
+        id: pr-info
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number
+            });
+
+            core.setOutput('pr-number', context.issue.number);
+            core.setOutput('pr-ref', pr.data.head.ref);
+            core.setOutput('pr-sha', pr.data.head.sha);
+            core.setOutput('pr-repo', pr.data.head.repo.full_name);
+
+            console.log(`PR #${context.issue.number}: ${pr.data.title}`);
+            console.log(`Branch: ${pr.data.head.ref}`);
+            console.log(`SHA: ${pr.data.head.sha}`);
+            console.log(`Repo: ${pr.data.head.repo.full_name}`);
+
+      - name: React to comment
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.reactions.createForIssueComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: context.payload.comment.id,
+              content: 'rocket'
+            });
+
+  trigger-build:
+    needs: check-comment
+    if: needs.check-comment.outputs.should-build == 'true'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger Docker build workflow
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            // Check if PR is from a fork
+            const prRepo = '${{ needs.check-comment.outputs.pr-repo }}';
+            const baseRepo = context.repo.owner + '/' + context.repo.repo;
+            const isFromFork = prRepo !== baseRepo;
+
+            let ref;
+            if (isFromFork) {
+              // For forks, we can't dispatch to the fork's branch, so we'll trigger on main/master
+              // but pass the PR info so the workflow can checkout the right commit
+              console.log(`PR is from fork (${prRepo}), dispatching on default branch`);
+
+              // Get the default branch
+              const repo = await github.rest.repos.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo
+              });
+              ref = repo.data.default_branch;
+              console.log(`Using default branch: ${ref}`);
+            } else {
+              // For same-repo PRs, use the actual branch
+              ref = '${{ needs.check-comment.outputs.pr-ref }}';
+              console.log(`PR is from same repo, using branch: ${ref}`);
+            }
+
+            const response = await github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'docker-image.yml',
+              ref: ref,
+              inputs: {
+                pr_number: '${{ needs.check-comment.outputs.pr-number }}',
+                pr_ref: '${{ needs.check-comment.outputs.pr-ref }}',
+                pr_sha: '${{ needs.check-comment.outputs.pr-sha }}'
+              }
+            });
+
+            console.log(`Triggered workflow dispatch for PR #${{ needs.check-comment.outputs.pr-number }} on ref: ${ref}`);
+
+      - name: Comment on PR
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: ${{ needs.check-comment.outputs.pr-number }},
+              body: '🚀 Docker build triggered for PR #${{ needs.check-comment.outputs.pr-number }}!\n\nCheck the [Actions tab](https://github.com/${{ github.repository }}/actions) for build progress.'
+            });

.github/workflows/push_release.yaml

@@ -58,6 +58,62 @@ jobs:
           fi
           echo "📝 Previous tag: ${PREVIOUS_TAG:-'none (first release)'}"
 
+      - name: Fetch changelog from local file
+        run: |
+          # Path to the local changelog file
+          CHANGELOG_FILE="data/Upload-Assistant-release_notes.md"
+
+          echo "🔍 Attempting to read changelog from: $CHANGELOG_FILE"
+
+          # Check if the file exists and read it
+          if [ -f "$CHANGELOG_FILE" ]; then
+            # Read the file content
+            GIST_CONTENT=$(cat "$CHANGELOG_FILE")
+
+            # Check if content is not empty
+            if [ -n "$GIST_CONTENT" ] && [ ${#GIST_CONTENT} -gt 10 ]; then
+              echo "✅ Successfully read content from local file"
+
+              # Get the first line and check if it matches the version
+              FIRST_LINE=$(echo "$GIST_CONTENT" | head -n 1)
+              echo "🔍 First line of file: '$FIRST_LINE'"
+              echo "🔍 Expected version: '${{ env.VERSION }}'"
+
+              # Check if first line matches the version (with or without markdown formatting)
+              if [[ "$FIRST_LINE" == "${{ env.VERSION }}" ]] || [[ "$FIRST_LINE" == "# ${{ env.VERSION }}" ]] || [[ "$FIRST_LINE" == "## ${{ env.VERSION }}" ]]; then
+                echo "✅ First line matches version, removing it and using rest of content"
+                # Remove the first line and use the rest
+                PROCESSED_CONTENT=$(echo "$GIST_CONTENT" | tail -n +2)
+              else
+                echo "⚠️ First line doesn't match version '${{ env.VERSION }}', skipping file content"
+                PROCESSED_CONTENT=""
+              fi
+
+              # Only set the changelog if we have processed content
+              if [ -n "$PROCESSED_CONTENT" ] && [ ${#PROCESSED_CONTENT} -gt 5 ]; then
+                echo "✅ Using local file changelog content"
+                # Save to environment variable
+                {
+                  echo "GIST_CHANGELOG<<EOF"
+                  echo "$PROCESSED_CONTENT"
+                  echo ""
+                  echo "---"
+                  echo ""
+                  echo "EOF"
+                } >> $GITHUB_ENV
+              else
+                echo "⚠️ No valid content after processing, skipping file"
+                echo "GIST_CHANGELOG=" >> $GITHUB_ENV
+              fi
+            else
+              echo "⚠️ File content appears to be empty or too short, skipping"
+              echo "GIST_CHANGELOG=" >> $GITHUB_ENV
+            fi
+          else
+            echo "⚠️ Changelog file '$CHANGELOG_FILE' not found, continuing without it"
+            echo "GIST_CHANGELOG=" >> $GITHUB_ENV
+          fi
+
       - name: Generate changelog from merged PRs and commits
         run: |
           if [ "${{ env.PREVIOUS_TAG }}" = "initial" ]; then
@@ -71,6 +127,12 @@ jobs:
           # Create changelog
           {
             echo "CHANGELOG<<EOF"
+
+            # Add Gist content at the top if it exists
+            if [ -n "${{ env.GIST_CHANGELOG }}" ]; then
+              echo "${{ env.GIST_CHANGELOG }}"
+            fi
+
             echo "## What's Changed"
             echo ""
 
@@ -123,6 +185,13 @@ jobs:
                   DISPLAY_AUTHOR="@$AUTHOR"
                 fi
 
+                # Map known username variations
+                case "$DISPLAY_AUTHOR" in
+                  "@flower"|"@Flower") DISPLAY_AUTHOR="@flowerey" ;;
+                  # Add other mappings as needed
+                  # "@oldname") DISPLAY_AUTHOR="@newname" ;;
+                esac
+
                 echo "* ${TITLE} by ${DISPLAY_AUTHOR} in https://github.com/${{ github.repository }}/pull/${PR_NUMBER}"
                 FOUND_CHANGES=true
 
@@ -133,7 +202,13 @@ jobs:
                 # Clean up branch name for display
                 CLEAN_BRANCH=$(echo "$BRANCH_NAME" | sed 's|-| |g' | sed 's/_/ /g')
 
-                echo "* Merge branch '${BRANCH_NAME}' by @${AUTHOR}"
+                # Apply username mapping to commit author as well
+                MAPPED_AUTHOR="@$AUTHOR"
+                case "$MAPPED_AUTHOR" in
+                  "@flower"|"@Flower") MAPPED_AUTHOR="@flowerey" ;;
+                esac
+
+                echo "* Merge branch '${BRANCH_NAME}' by ${MAPPED_AUTHOR}"
                 FOUND_CHANGES=true
 
               # Handle direct commits (non-merge commits that might be significant)
@@ -142,18 +217,19 @@ jobs:
                 if [[ ! $SUBJECT =~ ^Update\ version\.py ]] && [[ ! $SUBJECT =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ ! $AUTHOR =~ github-actions ]]; then
                   # Only include if it looks like a meaningful change
                   if [[ $SUBJECT =~ ^(feat|fix|add|update|improve|remove|refactor): ]] || [[ ${#SUBJECT} -gt 10 ]]; then
-                    echo "* ${SUBJECT} by @${AUTHOR} in ${COMMIT_HASH:0:7}"
+                    # Apply username mapping to commit author
+                    MAPPED_AUTHOR="@$AUTHOR"
+                    case "$MAPPED_AUTHOR" in
+                      "@flower"|"@Flower") MAPPED_AUTHOR="@flowerey" ;;
+                    esac
+
+                    echo "* ${SUBJECT} by ${MAPPED_AUTHOR} in ${COMMIT_HASH:0:7}"
                     FOUND_CHANGES=true
                   fi
                 fi
               fi
             done
-
-            # If no changes found, add default message
-            if [ "$FOUND_CHANGES" = false ]; then
-              echo "* Other minor updates and improvements"
-            fi
-
+
             echo ""
             if [ "${{ env.PREVIOUS_TAG }}" != "initial" ]; then
               echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ env.PREVIOUS_TAG }}...${{ env.VERSION }}"
@@ -174,18 +250,22 @@ jobs:
             echo "" >> "$VERSION_FILE"
           fi
 
-          # Prepend new release info
+          # Update version and prepend new release info
           TEMP_FILE=$(mktemp)
+
+          # Start with the NEW version (maintaining 'v' prefix format)
           echo "__version__ = \"${{ env.VERSION }}\"" > "$TEMP_FILE"
           echo "" >> "$TEMP_FILE"
           echo "\"\"\"" >> "$TEMP_FILE"
           echo "Release Notes for version ${{ env.VERSION }} ($TIMESTAMP):" >> "$TEMP_FILE"
           echo "" >> "$TEMP_FILE"
-          echo "${{ env.CHANGELOG }}" | sed 's/^/# /' >> "$TEMP_FILE"
+          cat <<EOF | sed 's/^/# /' >> "$TEMP_FILE"
+          ${{ env.CHANGELOG }}
+          EOF
           echo "\"\"\"" >> "$TEMP_FILE"
           echo "" >> "$TEMP_FILE"
 
-          # Skip the first line of existing version.py (old __version__)
+          # Add the rest of the existing file (skip first line since we're replacing it)
           if [ -f "$VERSION_FILE" ]; then
             tail -n +2 "$VERSION_FILE" >> "$TEMP_FILE"
           fi