Skip to content

Commit 4820fac

Browse files
author
psadi
committed
ci: switch base build to arch
1 parent c20eb5e commit 4820fac

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
platform: linux/amd64
2525
runs-on: ubuntu-24.04
2626
container:
27-
image: ${{ matrix.arch == 'aarch64' && 'arm64v8/ubuntu:24.04' || 'ubuntu:24.04' }}
27+
image: ghcr.io/pkgforge-dev/archlinux:latest
2828
options: "--privileged --cap-add SYS_ADMIN --device /dev/fuse"
2929
steps:
3030
- name: Checkout ghostty-appimage

setup.sh

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,17 @@
22

33
set -e
44

5-
export DEBIAN_FRONTEND="noninteractive"
65
export ARCH="$(uname -m)"
76

87
ZIG_VERSION="0.13.0"
98
MINISIGN_URL="https://github.com/jedisct1/minisign/releases/download/0.11/minisign-0.11-linux.tar.gz"
109

11-
# Detect latest version numbers when jq is available.
12-
if command -v jq >/dev/null 2>&1; then
13-
if [ "$1" = "latest" ]; then
14-
ZIG_VERSION="$(
15-
curl -s "https://ziglang.org/download/index.json" |
16-
jq -r '[keys[] | select(. != "master" and contains("."))] | sort_by(split(".") | map(tonumber)) | last'
17-
)"
18-
MINISIGN_URL="$(
19-
curl -s "https://api.github.com/repos/jedisct1/minisign/releases/latest" |
20-
jq -r --arg prefix "minisign" --arg suffix "linux.tar.gz" \
21-
'.assets[] | select(.name | startswith($prefix) and endswith($suffix)) | .browser_download_url'
22-
)"
23-
fi
24-
fi
25-
2610
# Update & install OS base dependencies
27-
rm /etc/apt/apt.conf.d/docker-clean
28-
buildPkgs="apt-utils build-essential libonig-dev libbz2-dev pandoc wget fuse libfuse2t64 file zsync appstream"
29-
ghosttyPkgs="libgtk-4-dev libadwaita-1-dev"
30-
apt-get -qq update && apt-get -qq -y upgrade
31-
apt-get -qq -y --download-only install ${buildPkgs} ${ghosttyPkgs}
32-
apt -qq -y install ${buildPkgs} ${ghosttyPkgs}
11+
buildPkgs="base-devel freetype2 oniguruma pandoc wget fuse file zsync appstream"
12+
ghosttyPkgs="gtk4 libadwaita"
13+
pacman -Syu
14+
pacman -Syw ${buildPkgs} ${ghosttyPkgs}
15+
pacman -Syq --needed ${buildPkgs} ${ghosttyPkgs}
3316

3417
# Download & install other dependencies
3518
# appimagetool: https://github.com/AppImage/appimagetool
@@ -59,6 +42,3 @@ rm -rf \
5942
/tmp/minisign-linux.tar.gz \
6043
/tmp/minisign-linux \
6144
/tmp/zig-linux.tar.xz
62-
63-
# Reset DEBIAN_FRONTEND to default
64-
unset DEBIAN_FRONTEND

0 commit comments

Comments
 (0)