try fix

Author: wolfv

.github/workflows/v1-sample-rebuild.yaml

@@ -189,8 +189,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: prefix-dev/setup-pixi@v0.8.1
         with:
@@ -209,56 +207,46 @@ jobs:
         continue-on-error: true
         with:
           pattern: v1-diff-*
-          path: docs/diffs/
+          path: diffs_staging/
           merge-multiple: true
 
-      - name: List downloaded diffs
+      - name: Upload diffs to release
+        if: github.ref == 'refs/heads/main'
+        run: |
+          # Create diffs release if it doesn't exist
+          gh release view diffs || gh release create diffs --title "Diffoscope Reports" --notes "Auto-updated diffoscope HTML reports for non-reproducible packages"
+
+          # Find and upload all diff HTML files
+          if [ -d "diffs_staging" ]; then
+            echo "=== Uploading diffs to release ==="
+            find diffs_staging -type f -name "*.html" | while read -r file; do
+              # Get just the filename for the asset name
+              basename=$(basename "$file")
+              echo "Uploading: $basename"
+              gh release upload diffs "$file" --clobber || echo "Failed to upload $file"
+            done
+            echo "Done uploading diffs"
+          else
+            echo "No diffs to upload"
+          fi
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: List uploaded diffs
         continue-on-error: true
         run: |
-          echo "=== Downloaded Diffs ==="
-          find docs/diffs -type f -name "*.html" 2>/dev/null | head -20 || echo "No diffs found"
-          echo "Total diff files: $(find docs/diffs -type f -name "*.html" 2>/dev/null | wc -l)"
-          echo "=== Directory structure ==="
-          find docs/diffs -type d 2>/dev/null || echo "No dirs"
+          echo "=== Diffs in release ==="
+          gh release view diffs --json assets -q '.assets[].name' | head -30 || echo "No diffs release"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Generate HTML pages
         run: |
           pixi run repror generate-html
 
-      - name: List generated files
-        run: |
-          echo "=== Generated HTML files ==="
-          ls -la docs/
-          if [ -d "docs/diffs" ]; then
-            echo "=== Diffs directory ==="
-            find docs/diffs -type f | head -30
-          fi
-
-      - name: Commit diffs to repository
-        if: github.ref == 'refs/heads/main'
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-
-          # Add the diffs directory if it exists and has files
-          if [ -d "docs/diffs" ] && [ "$(find docs/diffs -type f -name '*.html' 2>/dev/null | wc -l)" -gt 0 ]; then
-            git add docs/diffs/
-            if ! git diff --staged --quiet; then
-              git commit -m "Update diffoscope HTML reports"
-              git push
-              echo "Diffs committed and pushed"
-            else
-              echo "No changes to commit"
-            fi
-          else
-            echo "No diff files to commit"
-          fi
-
       - name: Update remote docs via API
         if: github.ref == 'refs/heads/main'
         run: |
-          # Pull latest changes (including diffs we just pushed)
-          git pull --rebase || true
           REPROR_UPDATE_TOKEN=${{ secrets.GITHUB_TOKEN }} pixi run repror generate-html --update-remote
 
   summarize-results:

src/repror/cli/templates/v1.html.jinja

@@ -165,8 +165,10 @@
 
                                     <!-- Diff link (if not reproducible and state is success) -->
                                     {% if not rebuild.is_reproducible and rebuild.state.value == 'success' %}
-                                    {% set diff_filename = rebuild.package_name ~ "_diff.html" %}
-                                    <a href="diffs/{{ rebuild.platform_name }}/{{ diff_filename }}"
+                                    {% set diff_filename = rebuild.package_name ~ "-" ~ rebuild.version ~ "_diff.html" %}
+                                    {% set diff_url = "https://github.com/prefix-dev/reproducible-builds/releases/download/diffs/" ~ diff_filename %}
+                                    <a href="https://htmlpreview.github.io/?{{ diff_url }}"
+                                       target="_blank"
                                        class="inline-flex items-center gap-1 px-3 py-1.5 text-xs font-medium text-purple-700 bg-purple-50 rounded-lg hover:bg-purple-100 transition-colors"
                                        title="View detailed diff">
                                         <i class="fa-solid fa-code-compare"></i>

src/repror/cli/v1_sampler.py

@@ -462,17 +462,19 @@ def run_diffoscope(
     original: Path,
     rebuilt: Path,
     package_name: str,
+    version: str,
     platform_name: str,
 ) -> Optional[Path]:
     """Run diffoscope to compare two packages.
 
-    Saves the HTML diff to build_info/v1/diffs/{platform}/{package}_diff.html
+    Saves the HTML diff to build_info/v1/diffs/{platform}/{package}-{version}_diff.html
     and prints a text summary to the log.
 
     Args:
         original: Path to the original .conda package
         rebuilt: Path to the rebuilt .conda package
         package_name: Name of the package (for output filename)
+        version: Version of the package (for unique filename)
         platform_name: Platform name (for output directory)
 
     Returns:
@@ -486,10 +488,11 @@ def run_diffoscope(
         return None
 
     # Save to persistent location for artifact upload
+    # Use name-version for unique identification
     output_dir = Path("build_info/v1/diffs") / platform_name
     output_dir.mkdir(parents=True, exist_ok=True)
-    html_output = output_dir / f"{package_name}_diff.html"
-    text_output = output_dir / f"{package_name}_diff.txt"
+    html_output = output_dir / f"{package_name}-{version}_diff.html"
+    text_output = output_dir / f"{package_name}-{version}_diff.txt"
 
     print(f"[dim]Running diffoscope to compare packages...[/dim]")
 
@@ -834,7 +837,7 @@ def rebuild_v1_package(
     # Run diffoscope if not reproducible
     diff_path: Optional[Path] = None
     if not is_reproducible:
-        diff_path = run_diffoscope(original_file, rebuilt_file, pkg_info.name, platform)
+        diff_path = run_diffoscope(original_file, rebuilt_file, pkg_info.name, pkg_info.version, platform)
 
     # Save successful rebuild
     v1_rebuild = V1Rebuild(