From 3e6c7494db81827ba7efc09e6f6fc3499e066232 Mon Sep 17 00:00:00 2001 From: toufic ar Date: Tue, 10 Feb 2026 20:48:34 +0200 Subject: [PATCH] modify packages, add build deps, and minor adjustment to build.sh --- .forgejo/workflows/build.yaml | 4 ++++ build.sh | 4 ++-- pkgbuilds.json | 9 +-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6ce0e79..0118481 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -18,6 +18,10 @@ jobs: echo "${{ secrets.GPG_PRIVATE_KEY }}" > /home/builder/private.asc echo "${{ secrets.GPG_KEY_PASSWD }}" > /home/builder/gpgpasswd chown builder: /home/builder/private.asc /home/builder/gpgpasswd + - name: install build deps + run: | + pacman -S --noconfirm --needed cmake + pacman -S --noconfirm --needed qt5-base qt5-x11extras qt6-base - name: checkout repo uses: actions/checkout@v6 - name: add ssh key diff --git a/build.sh b/build.sh index 255f62e..c4a83b2 100755 --- a/build.sh +++ b/build.sh @@ -32,9 +32,9 @@ jq -c '.[]' pkgbuilds.json | while IFS= read -r src; do --key $LONGKEY && repo-add -Rpsvk $LONGKEY \ "$BUILD_DIR"/taur.db.tar.zst \ - "$SRC_DIR"/"$pkg"/"$pkg"*.pkg.tar.zst && + "$SRC_DIR"/"$pkg"/*.pkg.tar.zst && cp -rfv \ - "$SRC_DIR"/"$pkg"/"$pkg"*.pkg.tar.zst "$SRC_DIR"/"$pkg"/"$pkg"*.pkg.tar.zst.sig \ + "$SRC_DIR"/"$pkg"/*.pkg.tar.zst "$SRC_DIR"/"$pkg"/*.pkg.tar.zst.sig \ "$BUILD_DIR" done done diff --git a/pkgbuilds.json b/pkgbuilds.json index 1b02278..9f1308a 100644 --- a/pkgbuilds.json +++ b/pkgbuilds.json @@ -1,14 +1,7 @@ [ { "base": "https://aur.archlinux.org", - "pkgs": [ - "librewolf-bin", - "ungoogled-chromium-bin", - "adwaita-qt5-git", - "adwaita-qt6-git", - "jdk24-openjdk", - "joplin-beta" - ], + "pkgs": ["librewolf-bin", "ungoogled-chromium-bin", "adwaita-qt-git"], "rm": [] } ]