From 8bcfe7a9b13ff3e9cc4e2451ee7f14fa134fc807 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 17:38:36 -0500 Subject: [PATCH 01/10] fix: add srcinfo --- .SRCINFO | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7111974..e69de29 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +0,0 @@ -pkgbase = sioyek-dev - pkgdesc = PDF viewer for research papers and technical books (development branch) - pkgver = 2.0.0.r1086.g719e2070 - pkgrel = 1 - url = https://github.com/ahrm/sioyek - arch = x86_64 - license = GPL3 - makedepends = git - depends = harfbuzz - depends = qt6-base - depends = qt6-3d - depends = qt6-declarative - depends = qt6-svg - depends = qt6-speech - depends = zlib - optdepends = qt6-wayland: Native Wayland (currently broken, uses XWayland by default) - provides = sioyek - conflicts = sioyek - conflicts = sioyek-git - source = git+https://github.com/ahrm/sioyek.git#branch=development - sha256sums = SKIP - -pkgname = sioyek-dev From 811374782b74073a1b915eb92e220e0ab641c8da Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 17:56:08 -0500 Subject: [PATCH 02/10] feat(ci): auto-deploy to aur --- .github/workflows/aur.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/aur.yml diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml new file mode 100644 index 0000000..df31bc3 --- /dev/null +++ b/.github/workflows/aur.yml @@ -0,0 +1,31 @@ +name: Update AUR + +on: + push: + branches: [main] + paths: [PKGBUILD] + +jobs: + publish: + runs-on: ubuntu-latest + container: archlinux:base-devel + steps: + - uses: actions/checkout@v4 + + - run: makepkg --printsrcinfo > .SRCINFO + + - name: Push to AUR + env: + AUR_SSH_KEY: ${{ secrets.AUR_SSH_KEY }} + run: | + pacman -Sy --noconfirm openssh git + mkdir -p ~/.ssh + echo "$AUR_SSH_KEY" > ~/.ssh/id_ed25519 + chmod 600 ~/.ssh/id_ed25519 + ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts + git config user.name "Barrett Ruth" + git config user.email "barrettruth@gmail.com" + git remote add aur ssh://aur@aur.archlinux.org/sioyek-dev.git + git add .SRCINFO + git diff --cached --quiet || git commit -m "update .SRCINFO" + git push aur HEAD:main From 4b90c471d2b35f789c6cf4b970e1f15669727618 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 17:57:38 -0500 Subject: [PATCH 03/10] fix(ci) : dont run as root --- .github/workflows/aur.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index df31bc3..eb0bf99 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -12,7 +12,10 @@ jobs: steps: - uses: actions/checkout@v4 - - run: makepkg --printsrcinfo > .SRCINFO + - run: | + useradd -m builder + chown -R builder: . + su builder -c 'makepkg --printsrcinfo > .SRCINFO' - name: Push to AUR env: From 4663fe482d7a3060efd7ba74a1f95bb272a33f39 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 17:59:22 -0500 Subject: [PATCH 04/10] fix(ci): workflow trigger to run aur push on demand --- .github/workflows/aur.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index eb0bf99..f501153 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -1,6 +1,7 @@ name: Update AUR on: + workflow_dispatch: push: branches: [main] paths: [PKGBUILD] From 3bf166590d990a1dc9c2bc4956c9dc47233ebaa1 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 18:01:08 -0500 Subject: [PATCH 05/10] fix --- .github/workflows/aur.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index f501153..d2613de 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -26,7 +26,8 @@ jobs: mkdir -p ~/.ssh echo "$AUR_SSH_KEY" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts + echo "aur.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuBKrPzbawxA/k2g6NcyV5jmqwJ2s+zpgZGZ7tpLIhd" >> ~/.ssh/known_hosts + git config --global safe.directory "$GITHUB_WORKSPACE" git config user.name "Barrett Ruth" git config user.email "barrettruth@gmail.com" git remote add aur ssh://aur@aur.archlinux.org/sioyek-dev.git From 7c6c5bb3a0306b1040aee8e2c759cb005118be85 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 18:03:30 -0500 Subject: [PATCH 06/10] fix --- .github/workflows/aur.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index d2613de..38e3db4 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -11,6 +11,8 @@ jobs: runs-on: ubuntu-latest container: archlinux:base-devel steps: + - run: pacman -Sy --noconfirm openssh git + - uses: actions/checkout@v4 - run: | @@ -22,12 +24,11 @@ jobs: env: AUR_SSH_KEY: ${{ secrets.AUR_SSH_KEY }} run: | - pacman -Sy --noconfirm openssh git - mkdir -p ~/.ssh - echo "$AUR_SSH_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - echo "aur.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuBKrPzbawxA/k2g6NcyV5jmqwJ2s+zpgZGZ7tpLIhd" >> ~/.ssh/known_hosts - git config --global safe.directory "$GITHUB_WORKSPACE" + mkdir -p /root/.ssh + echo "$AUR_SSH_KEY" > /root/.ssh/id_ed25519 + chmod 600 /root/.ssh/id_ed25519 + echo "aur.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuBKrPzbawxA/k2g6NcyV5jmqwJ2s+zpgZGZ7tpLIhd" >> /root/.ssh/known_hosts + git config --global safe.directory '*' git config user.name "Barrett Ruth" git config user.email "barrettruth@gmail.com" git remote add aur ssh://aur@aur.archlinux.org/sioyek-dev.git From 7e90e8a05ec22f2be29cbb1fdf0389cf07161a12 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 18:04:54 -0500 Subject: [PATCH 07/10] fix --- .github/workflows/aur.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index 38e3db4..3874b2e 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -27,7 +27,7 @@ jobs: mkdir -p /root/.ssh echo "$AUR_SSH_KEY" > /root/.ssh/id_ed25519 chmod 600 /root/.ssh/id_ed25519 - echo "aur.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuBKrPzbawxA/k2g6NcyV5jmqwJ2s+zpgZGZ7tpLIhd" >> /root/.ssh/known_hosts + ssh-keyscan -t ed25519 aur.archlinux.org >> /root/.ssh/known_hosts 2>/dev/null git config --global safe.directory '*' git config user.name "Barrett Ruth" git config user.email "barrettruth@gmail.com" From 49d56aaa094bedcfac3b5b275526aec58d08e729 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 18:05:58 -0500 Subject: [PATCH 08/10] fix(ci): dont shallow clone --- .github/workflows/aur.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index 3874b2e..1332733 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -14,6 +14,8 @@ jobs: - run: pacman -Sy --noconfirm openssh git - uses: actions/checkout@v4 + with: + fetch-depth: 0 - run: | useradd -m builder From 67ab4ad66de1646997c4ea408ee482d720f90e21 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 18:08:10 -0500 Subject: [PATCH 09/10] fix(ci): push main to master --- .github/workflows/aur.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index 1332733..972107e 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -36,4 +36,4 @@ jobs: git remote add aur ssh://aur@aur.archlinux.org/sioyek-dev.git git add .SRCINFO git diff --cached --quiet || git commit -m "update .SRCINFO" - git push aur HEAD:main + git push aur HEAD:master From c10565d773d626eefc71d09d5cfa8d7750f6abad Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 18 Feb 2026 18:10:43 -0500 Subject: [PATCH 10/10] fix: flat dirs --- .github/workflows/aur.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index 972107e..3f0e065 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -31,9 +31,11 @@ jobs: chmod 600 /root/.ssh/id_ed25519 ssh-keyscan -t ed25519 aur.archlinux.org >> /root/.ssh/known_hosts 2>/dev/null git config --global safe.directory '*' + git clone ssh://aur@aur.archlinux.org/sioyek-dev.git /tmp/aur + cp PKGBUILD .SRCINFO /tmp/aur/ + cd /tmp/aur git config user.name "Barrett Ruth" git config user.email "barrettruth@gmail.com" - git remote add aur ssh://aur@aur.archlinux.org/sioyek-dev.git - git add .SRCINFO + git add PKGBUILD .SRCINFO git diff --cached --quiet || git commit -m "update .SRCINFO" - git push aur HEAD:master + git push