diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2028b7a..75f236f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -277,17 +277,6 @@ jobs: "Commit " + .commit[0:7] + " ยท [run](" + .run + ")" ' publish-record.json > comment.md cat comment.md - - name: Comment on the merged PR - env: - GH_TOKEN: ${{ github.token }} - run: | - pr=$(gh api "repos/${{ github.repository }}/commits/${{ github.sha }}/pulls" --jq '.[0].number // empty') - if [[ -n "$pr" ]]; then - gh pr comment "$pr" -R "${{ github.repository }}" --body-file comment.md - echo "commented on #$pr" - else - echo "no PR for ${{ github.sha }} (manual dispatch?); skipping PR comment" - fi - name: Append to the publish log in the bucket env: RCLONE_CONFIG_R2_TYPE: s3 @@ -305,6 +294,21 @@ jobs: ./rclone copyto publish-log.jsonl R2:omarchy-pkgs/publish-log.jsonl --s3-no-head echo "log now has $(wc -l < publish-log.jsonl) entries" + - name: Comment on the merged PR + # Only for a push: the merge commit names its PR. A dispatch runs + # from master's head, whose PR merged something else entirely, so + # commenting there would attach this run's report to the wrong PR. + if: github.event_name == 'push' + env: + GH_TOKEN: ${{ github.token }} + run: | + pr=$(gh api "repos/${{ github.repository }}/commits/${{ github.sha }}/pulls" --jq '.[0].number // empty') + if [[ -n "$pr" ]]; then + gh pr comment "$pr" -R "${{ github.repository }}" --body-file comment.md + echo "commented on #$pr" + else + echo "no PR for ${{ github.sha }} (manual dispatch?); skipping PR comment" + fi result: needs: [changes, publish] if: always() diff --git a/pkgbuilds/hype/.omarchy/package.json b/pkgbuilds/hype/.omarchy/package.json new file mode 100644 index 0000000..2a9719d --- /dev/null +++ b/pkgbuilds/hype/.omarchy/package.json @@ -0,0 +1,3 @@ +{ + "source": "local" +} diff --git a/pkgbuilds/hype/PKGBUILD b/pkgbuilds/hype/PKGBUILD new file mode 100644 index 0000000..66ce55c --- /dev/null +++ b/pkgbuilds/hype/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: David Heinemeier Hansson + +pkgname=hype +pkgver=0.1.0 +pkgrel=4 +pkgdesc='Simple Markdown presentations with a visual slide editor' +arch=('x86_64' 'aarch64') +url='https://github.com/omacom/hype' +license=('MIT') +install='hype.install' +options=('!debug') +depends=( + 'ffmpeg' + 'hicolor-icon-theme' + 'qt6-base>=6.8' + 'qt6-declarative>=6.8' + 'qt6-multimedia' + 'qt6-imageformats' + 'qt6-svg' + 'source-highlight' + 'zlib' + 'libwebp' + 'xdg-desktop-portal' +) +makedepends=('gcc' 'git' 'make') +# Pin the source until a tagged release is available. +_commit=fc9b3baaad0d6ef357e1bd6a97c67d58e733024e +source=("git+$url.git#commit=$_commit") +# makepkg hashes git archive --format tar of the pinned commit. +sha256sums=('f15ac30a3e42ebebbc9d64eac1f1fe6231a5e7366ba25c211bef5e193a912b07') + +build() { + cd "$srcdir/$pkgname" + ./bin/build +} + +package() { + cd "$srcdir/$pkgname" + + install -Dm755 build/hype "$pkgdir/usr/bin/hype" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 pkgbuild/hype.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/hype.svg" + install -Dm644 pkgbuild/hype.desktop "$pkgdir/usr/share/applications/hype.desktop" + install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md" +} diff --git a/pkgbuilds/hype/hype.install b/pkgbuilds/hype/hype.install new file mode 100644 index 0000000..5357602 --- /dev/null +++ b/pkgbuilds/hype/hype.install @@ -0,0 +1,12 @@ +post_install() { + command -v update-desktop-database >/dev/null 2>&1 && update-desktop-database -q + command -v gtk-update-icon-cache >/dev/null 2>&1 && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}