小调整

Author: wangliang181230

.github/workflows/publish-to-aur.yml

@@ -78,15 +78,115 @@ jobs:
           echo "======== Updated PKGBUILD ========"
           cat "${PKGBUILD}"
 
-      # ── Push to AUR ───────────────────────────────────────────────────────────
-      - name: "Deploy to AUR"
-        uses: KSXGitHub/github-actions-deploy-aur@v2.7.2
-        with:
-          pkgname: dev-sidecar-bin
-          pkgbuild: packages/aur/PKGBUILD
-          commit_username: ${{ vars.AUR_USERNAME }}
-          commit_email: ${{ vars.AUR_EMAIL }}
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to v${{ steps.version.outputs.version }}"
-          allow_empty_commits: false
-          force_push: true
+      # ── Push to AUR via git + SSH ─────────────────────────────────────────────
+      - name: "Set up SSH key for AUR"
+        run: |
+          install -dm700 ~/.ssh
+
+          # Write the private key
+          echo "${{ secrets.AUR_SSH_PRIVATE_KEY }}" > ~/.ssh/aur_id
+          chmod 600 ~/.ssh/aur_id
+
+          # Trust AUR's host key
+          ssh-keyscan -t rsa,ecdsa,ed25519 aur.archlinux.org >> ~/.ssh/known_hosts 2>/dev/null
+          chmod 644 ~/.ssh/known_hosts
+
+          # SSH config: use this key for AUR
+          cat >> ~/.ssh/config << 'EOF'
+Host aur.archlinux.org
+  IdentityFile ~/.ssh/aur_id
+  User aur
+EOF
+          chmod 600 ~/.ssh/config
+
+      - name: "Clone AUR repository"
+        run: |
+          git clone ssh://aur@aur.archlinux.org/dev-sidecar-bin.git /tmp/aur-dev-sidecar-bin
+
+      - name: "Copy PKGBUILD and generate .SRCINFO"
+        run: |
+          cp packages/aur/PKGBUILD /tmp/aur-dev-sidecar-bin/PKGBUILD
+
+          # Generate .SRCINFO (makepkg is not available on the ubuntu runner since pacman is
+          # not installed, so we generate it with a small Python helper that parses the
+          # PKGBUILD variables we set)
+          cd /tmp/aur-dev-sidecar-bin
+
+          python3 - << 'PYEOF'
+          import re, subprocess, pathlib
+
+          pkgbuild = pathlib.Path("PKGBUILD").read_text()
+
+          def extract(var):
+              m = re.search(rf"^{var}=(.+)", pkgbuild, re.MULTILINE)
+              return m.group(1).strip().strip("'\"") if m else ""
+
+          pkgname    = extract("pkgname")
+          pkgver     = extract("pkgver")
+          pkgrel     = extract("pkgrel")
+          pkgdesc    = extract("pkgdesc").strip("'\"")
+          arch_line  = re.search(r"^arch=\((.+)\)", pkgbuild, re.MULTILINE).group(1)
+          archs      = re.findall(r"'([^']+)'", arch_line)
+          url        = extract("url")
+          license_   = re.search(r"^license=\('([^']+)'\)", pkgbuild, re.MULTILINE).group(1)
+          depends_m  = re.search(r"^depends=\((.+?)\)", pkgbuild, re.MULTILINE | re.DOTALL)
+          depends    = re.findall(r"'([^']+)'", depends_m.group(1)) if depends_m else []
+          provides_m = re.search(r"^provides=\('([^']+)'\)", pkgbuild, re.MULTILINE)
+          provides   = [provides_m.group(1)] if provides_m else []
+          conflicts_m= re.search(r"^conflicts=\('([^']+)'\)", pkgbuild, re.MULTILINE)
+          conflicts  = [conflicts_m.group(1)] if conflicts_m else []
+
+          src_x86    = re.search(r"^source_x86_64=\(\"([^\"]+)\"\)", pkgbuild, re.MULTILINE)
+          src_aarch  = re.search(r"^source_aarch64=\(\"([^\"]+)\"\)", pkgbuild, re.MULTILINE)
+          sha_x86    = re.search(r"^sha256sums_x86_64=\('([^']+)'\)", pkgbuild, re.MULTILINE)
+          sha_aarch  = re.search(r"^sha256sums_aarch64=\('([^']+)'\)", pkgbuild, re.MULTILINE)
+
+          lines = []
+          lines.append("# Generated by mksrcinfo helper")
+          lines.append(f"pkgbase = {pkgname}")
+          lines.append(f"\tpkgdesc = {pkgdesc}")
+          lines.append(f"\tpkgver = {pkgver}")
+          lines.append(f"\tpkgrel = {pkgrel}")
+          lines.append(f"\turl = {url}")
+          for a in archs:
+              lines.append(f"\tarch = {a}")
+          lines.append(f"\tlicense = {license_}")
+          for d in depends:
+              lines.append(f"\tdepends = {d}")
+          for p in provides:
+              lines.append(f"\tprovides = {p}")
+          for c in conflicts:
+              lines.append(f"\tconflicts = {c}")
+          if src_x86:
+              lines.append(f"\tsource_x86_64 = {src_x86.group(1)}")
+          if sha_x86:
+              lines.append(f"\tsha256sums_x86_64 = {sha_x86.group(1)}")
+          if src_aarch:
+              lines.append(f"\tsource_aarch64 = {src_aarch.group(1)}")
+          if sha_aarch:
+              lines.append(f"\tsha256sums_aarch64 = {sha_aarch.group(1)}")
+          lines.append("")
+          lines.append(f"pkgname = {pkgname}")
+
+          pathlib.Path(".SRCINFO").write_text("\n".join(lines) + "\n")
+          print(".SRCINFO generated:")
+          print("\n".join(lines))
+          PYEOF
+
+      - name: "Commit and push to AUR"
+        run: |
+          cd /tmp/aur-dev-sidecar-bin
+
+          git config user.name "${{ vars.AUR_USERNAME }}"
+          git config user.email "${{ vars.AUR_EMAIL }}"
+
+          git add PKGBUILD .SRCINFO
+
+          # Only commit if there are actual changes
+          if git diff --cached --quiet; then
+            echo "No changes to commit – AUR is already up to date."
+          else
+            git commit -m "Update to v${{ steps.version.outputs.version }}"
+            git push
+            echo "Successfully pushed to AUR."
+          fi