Publish AUR package

Author: pol-rivero

.github/workflows/ci-linux.yml

@@ -145,6 +145,7 @@ jobs:
           for file in $(find ./artifacts -type f -name "GitHubDesktop-linux-*"); do
             new_name=$(echo "$file" | sed -E "s/GitHubDesktop-linux-(.*)-[0-9]+\\.[0-9]+\\.[0-9]+\\.(.*)/GitHubDesktopPlus-${{ env.RELEASE_TAG }}-linux-\\1.\\2/")
             new_name=$(echo $new_name | sed -E "s/linux-amd64/linux-x86_64/")
+            new_name=$(echo $new_name | sed -E "s/linux-aarch64/linux-arm64/")
             mv --verbose "$file" "$new_name"
           done
 
@@ -160,3 +161,45 @@ jobs:
           fail_on_unmatched_files: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Prepare PKGBUILD
+        run: |
+          AUR_DIR=./aur
+          PKGBUILD_FILE=$AUR_DIR/PKGBUILD
+          echo "AUR_DIR=$AUR_DIR" >> $GITHUB_ENV
+          echo "PKGBUILD_FILE=$PKGBUILD_FILE" >> $GITHUB_ENV
+          if [[ ! -f "$PKGBUILD_FILE" ]]; then
+              echo "$PKGBUILD_FILE does not exist. Contents of current directory:"
+              ls -la
+              exit 1
+          fi
+          version_without_v=$(echo "${{ env.RELEASE_TAG_WITHOUT_PREFIX }}" | sed -E "s/v(.*)/\\1/")
+          sed -i "s/\[\[VERSION_WITHOUT_V\]\]/$version_without_v/" $PKGBUILD_FILE
+          desktop_file_sha256=$(sha256sum $AUR_DIR/github-desktop-plus.desktop | awk '{ print $1 }')
+          sed -i "s/\[\[DESKTOP_FILE_SHA256\]\]/$desktop_file_sha256/" $PKGBUILD_FILE
+          x86_64_sha256=$(sha256sum artifacts/**/*-x86_64.deb | awk '{ print $1 }')
+          sed -i "s/\[\[X86_64_SHA256\]\]/$x86_64_sha256/" $PKGBUILD_FILE
+          aarch64_sha256=$(sha256sum artifacts/**/*-arm64.deb | awk '{ print $1 }')
+          sed -i "s/\[\[AARCH64_SHA256\]\]/$aarch64_sha256/" $PKGBUILD_FILE
+          armv7h_sha256=$(sha256sum artifacts/**/*-armhf.deb | awk '{ print $1 }')
+          sed -i "s/\[\[ARMV7H_SHA256\]\]/$armv7h_sha256/" $PKGBUILD_FILE
+
+      - name: Upload PKGBUILD
+        uses: actions/upload-artifact@v4
+        with:
+          name: PKGBUILD
+          path: ${{ env.PKGBUILD_FILE }}
+          retention-days: 5
+          if-no-files-found: error
+
+      - name: Publish AUR package
+        uses: KSXGitHub/github-actions-deploy-aur@v4.1.0
+        with:
+          pkgname: github-desktop-plus-bin
+          pkgbuild: ${{ env.PKGBUILD_FILE }}
+          commit_username: ${{ secrets.AUR_USERNAME }}
+          commit_email: ${{ secrets.AUR_EMAIL }}
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message:
+            'Update AUR package to version ${{ env.RELEASE_TAG_WITHOUT_PREFIX }}'
+          ssh_keyscan_types: rsa,ecdsa,ed25519

.github/workflows/ci.yml

@@ -197,15 +197,18 @@ jobs:
         run: |
           # GitHubDesktopSetup-<arch>.<ext> -> GitHubDesktopPlus-<release_tag>-windows-<arch>.<ext>
           for file in $(find ./artifacts -type f -name "GitHubDesktopSetup-*"); do
-            mv --verbose "$file" $(echo "$file" | sed -E "s/GitHubDesktopSetup-(.*)\\.(.*)/GitHubDesktopPlus-${{ env.RELEASE_TAG }}-windows-\\1.\\2/")
+            new_name=$(echo "$file" | sed -E "s/GitHubDesktopSetup-(.*)\\.(.*)/GitHubDesktopPlus-${{ env.RELEASE_TAG }}-windows-\\1.\\2/")
+            mv --verbose "$file" "$new_name"
           done
 
           # GitHub Desktop-<arch>.zip -> GitHubDesktopPlus-<release_tag>-macOS-<arch>.zip
-          for file in $(find ./artifacts -type f -name "GitHub Desktop-*.zip"); do
-            mv --verbose "$file" $(echo "$file" | sed -E "s/GitHub Desktop-(.*)\\.zip/GitHubDesktopPlus-${{ env.RELEASE_TAG }}-macOS-\\1.zip/")
+          find ./artifacts -type f -name "GitHub Desktop-*.zip" -print0 | while IFS= read -r -d '' file; do
+            new_name=$(echo "$file" | sed -E "s/GitHub Desktop-(.*)\\.zip/GitHubDesktopPlus-${{ env.RELEASE_TAG }}-macOS-\\1.zip/")
+            mv --verbose "$file" "$new_name"
           done
 
       - name: Upload assets to release
-        run: gh release upload $RELEASE_TAG ./artifacts/* --clobber
+        run: |
+          gh release upload ${{ env.RELEASE_TAG }} artifacts/**/*.exe artifacts/**/*.msi artifacts/**/*.zip --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

aur/.gitignore

@@ -0,0 +1,5 @@
+pkg/
+src/
+
+*.pkg.tar.zst
+*.deb

aur/PKGBUILD

@@ -0,0 +1,47 @@
+# Maintainer: Pol Rivero < aur AT polrivero DOT com >
+# Contributor: Padraic Fanning < fanninpm AT miamioh DOT edu >
+# Contributor: Jake <aur@ja-ke.tech>
+# Contributor: Ian MacKay <immackay0@gmail.com>
+
+_pkgname='github-desktop-plus'
+pkgname="${_pkgname}-bin"
+pkgver=[[VERSION_WITHOUT_V]]
+pkgrel=1
+pkgdesc="Work-in-progress fork of GitHub Desktop with extra features."
+arch=('x86_64' 'aarch64' 'armv7h')
+url="https://desktop.github.com"
+license=('MIT')
+depends=(
+    'curl'
+    'git'
+    'libsecret'
+    'libxss'
+    'nspr'
+    'nss'
+    'org.freedesktop.secrets'
+    'unzip'
+)
+optdepends=('hub: CLI interface for GitHub.')
+provides=(${_pkgname})
+conflicts=(${_pkgname})
+source=(${_pkgname}.desktop)
+
+_common_download_url="https://github.com/pol-rivero/github-desktop-plus/releases/download/v${pkgver}/GitHubDesktopPlus-v${pkgver}-linux"
+source_x86_64=(${_common_download_url}-x86_64.deb)
+source_aarch64=(${_common_download_url}-arm64.deb)
+source_armv7h=(${_common_download_url}-armhf.deb)
+
+sha256sums=('[[DESKTOP_FILE_SHA256]]')
+sha256sums_x86_64=('[[X86_64_SHA256]]')
+sha256sums_aarch64=('[[AARCH64_SHA256]]')
+sha256sums_armv7h=('[[ARMV7H_SHA256]]')
+package() {
+    tar xf data.tar.xz -C "${pkgdir}"
+    install -d "${pkgdir}/opt/${_pkgname}"
+    mv "${pkgdir}/usr/lib/github-desktop" "${pkgdir}/opt/"
+
+    rm "${pkgdir}/usr/share/applications/github-desktop.desktop"
+    install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+
+    ln -sf "/opt/$_pkgname/$_pkgname" "${pkgdir}/usr/bin/$_pkgname"
+}

aur/github-desktop-plus.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=GitHub Desktop Plus
+Comment=Extend your GitHub workflow beyond your browser with GitHub Desktop
+Comment[es]=Trabaja con GitHub desde tu escritorio.
+Comment[eu]=GitHub-ekin lan egin zure ordenagailutik.
+Exec=/usr/bin/github-desktop %U
+Terminal=false
+Type=Application
+Icon=github-desktop
+Categories=Development;
+MimeType=x-scheme-handler/x-github-client;x-scheme-handler/x-github-desktop-auth;x-scheme-handler/x-github-desktop-dev-auth;