From 164c4421df2a0013feab31b7f340a2d582520f1a Mon Sep 17 00:00:00 2001 From: Samueru-sama Date: Tue, 16 Jun 2026 13:58:04 -0400 Subject: [PATCH] use our setup action --- .github/workflows/ci.yaml | 3 +++ bin/bundle-appimage.sh | 4 ++-- bin/setup-env.sh | 14 ++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 37740d8..bc55ec6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,6 +40,9 @@ jobs: with: persist-credentials: false + - name: Preparing Container + uses: pkgforge-dev/anylinux-setup-action@0964f2258d6c93d1391359978dde081fd8b3c6af # v2 + - name: Cache dependencies id: cache-ghostty uses: actions/cache@v4 diff --git a/bin/bundle-appimage.sh b/bin/bundle-appimage.sh index 58c125d..16b6954 100755 --- a/bin/bundle-appimage.sh +++ b/bin/bundle-appimage.sh @@ -13,9 +13,9 @@ export OUTNAME="Ghostty-${GHOSTTY_VERSION}-${ARCH}.AppImage" export DESKTOP="./ghostty-${GHOSTTY_VERSION}/zig-out/share/applications/com.mitchellh.ghostty.desktop" export ICON="./ghostty-${GHOSTTY_VERSION}/zig-out/share/icons/hicolor/256x256/apps/com.mitchellh.ghostty.png" -./quick-sharun ./ghostty-${GHOSTTY_VERSION}/zig-out/bin/ghostty +quick-sharun ./ghostty-${GHOSTTY_VERSION}/zig-out/bin/ghostty cp -rf ./ghostty-${GHOSTTY_VERSION}/zig-out/share/* ./AppDir/share/ -./quick-sharun --make-appimage +quick-sharun --make-appimage mkdir -p ./dist mv -v ./*.AppImage* ./dist diff --git a/bin/setup-env.sh b/bin/setup-env.sh index a26e60d..ea5c43a 100755 --- a/bin/setup-env.sh +++ b/bin/setup-env.sh @@ -27,17 +27,11 @@ ARCH="$(uname -m)" MINISIGN_VERSION="$(get_latest_gh_release 'jedisct1/minisign')" GH_BASE="https://github.com" -GH_USER_CONTENT="https://raw.githubusercontent.com" MINISIGN_URL="${GH_BASE}/jedisct1/minisign/releases/download/${MINISIGN_VERSION}/minisign-${MINISIGN_VERSION}-linux.tar.gz" -DEBLOATED_PKGS="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh" -SHARUN="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh" - -# Install Debloated Pkgs -wget "${DEBLOATED_PKGS}" -O /tmp/get-debloated-pkgs.sh -chmod a+x /tmp/get-debloated-pkgs.sh -sh /tmp/get-debloated-pkgs.sh --add-common --prefer-nano +# Install Debloated Pkgs (get-debloated-pkgs provided by anylinux-setup-action) +get-debloated-pkgs --add-common --prefer-nano # minisign: https://github.com/jedisct1/minisign rm -rf /usr/local/bin/minisign @@ -45,10 +39,6 @@ wget "${MINISIGN_URL}" -O /tmp/minisign-linux.tar.gz tar -xzf /tmp/minisign-linux.tar.gz -C /tmp mv /tmp/minisign-linux/"${ARCH}"/minisign /usr/local/bin -# Sharun -wget "${SHARUN}" -O quick-sharun -chmod +x quick-sharun - # Cleanup pacman -Scc --noconfirm