Skip to content

Commit d14b59c

Browse files
authored
Merge pull request #45 from psadi/feature/ci_fix
ci: gh cache, disbale nix fetch
2 parents fc9a018 + dc03a14 commit d14b59c

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ jobs:
4141
with:
4242
path: |
4343
/tmp/offline-cache
44-
key: ${{ runner.os }}-${{ matrix.arch }}-ghostty-${{ hashFiles('**/setup.sh') }}
44+
/root/.cache/zig
45+
key: ${{ runner.os }}-${{ matrix.arch }}-ghostty-${{ hashFiles('**/VERSION') }}
4546
restore-keys: |
4647
${{ runner.os }}-${{ matrix.arch }}-ghostty-
4748

build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ rm "ghostty-${GHOSTTY_VERSION}.tar.gz"
5050
cd "${TMP_DIR}/${BUILD_DIR}"
5151

5252
# Fetch Zig Cache
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
53+
# if [ -f './nix/build-support/fetch-zig-cache.sh' ]; then
54+
# ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/fetch-zig-cache.sh
55+
# BUILD_ARGS="${BUILD_ARGS} --system /tmp/offline-cache/p"
56+
# fi
5757

5858
# Build Ghostty with zig
59+
echo " BUILD_ARGS: '${BUILD_ARGS}"
5960
zig build ${BUILD_ARGS}
6061

6162
# Prepare AppImage -- Configure launcher script, metainfo and desktop file with icon.

0 commit comments

Comments
 (0)