Skip to content

Commit 47d9210

Browse files
author
psadi
committed
ci: container img update
1 parent a4ae3c3 commit 47d9210

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
platform: linux/amd64
2929
runs-on: ubuntu-24.04
3030
container:
31-
image: ghcr.io/pkgforge-dev/archlinux:latest
31+
image: ghcr.io/psadi/ghostty-appimage:latest
3232
steps:
3333
- name: Checkout ghostty-appimage
3434
uses: actions/checkout@v4
@@ -40,17 +40,11 @@ jobs:
4040
uses: actions/cache@v4
4141
with:
4242
path: |
43-
/var/cache/pacman
4443
/tmp/offline-cache
45-
/usr/local/bin
46-
/opt
4744
key: ${{ runner.os }}-${{ matrix.arch }}-ghostty-${{ hashFiles('**/setup.sh') }}
4845
restore-keys: |
4946
${{ runner.os }}-${{ matrix.arch }}-ghostty-
5047
51-
- name: Setup Build Environment
52-
run: ./setup.sh
53-
5448
- name: Build Ghostty AppImage
5549
run: |
5650
if [ "${{ github.event_name }}" == "schedule" ]; then

build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ BUILD_ARGS="
2121
-Demit-docs \
2222
-Dgtk-wayland=true \
2323
-Dgtk-x11=true"
24-
# --system /tmp/offline-cache/p \
2524

2625
rm -rf "${TMP_DIR}"
2726

@@ -35,7 +34,7 @@ if [ $GHOSTTY_VERSION == "tip" ]; then
3534
wget "https://github.com/ghostty-org/ghostty/releases/download/tip/ghostty-source.tar.gz.minisig" -O ghostty-${GHOSTTY_VERSION}.tar.gz.minisig
3635
else
3736
BUILD_DIR="ghostty-${GHOSTTY_VERSION}"
38-
BUILD_ARGS="$BUILD_ARGS -Dversion-string=${GHOSTTY_VERSION}"
37+
BUILD_ARGS="${BUILD_ARGS} -Dversion-string=${GHOSTTY_VERSION}"
3938
wget "https://release.files.ghostty.org/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz"
4039
wget "https://release.files.ghostty.org/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
4140
fi
@@ -51,8 +50,10 @@ rm "ghostty-${GHOSTTY_VERSION}.tar.gz"
5150
cd "${TMP_DIR}/${BUILD_DIR}"
5251

5352
# Fetch Zig Cache
54-
# TODO: Revert cache once upstream fixes fetch
55-
# ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/check-zig-cache.sh
53+
if [ -f './nix/build-support/fetch-zig-cache.sh' ]; then
54+
BUILD_ARGS="${BUILD_ARGS} --system /tmp/offline-cache/p"
55+
ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/fetch-zig-cache.sh
56+
fi
5657

5758
# Build Ghostty with zig
5859
zig build ${BUILD_ARGS}

0 commit comments

Comments
 (0)