Skip to content

Commit 1d16b19

Browse files
authored
Merge pull request #3 from sidequery/nicosuave/fix-restore-path
Guard macOS restore paths for deleted worktrees
2 parents 46c5680 + 197e953 commit 1d16b19

20 files changed

Lines changed: 340 additions & 407 deletions

.github/workflows/nix.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
jobs:
99
required:
1010
name: "Required Checks: Nix"
11-
runs-on: namespace-profile-ghostty-sm
11+
runs-on: ubuntu-24.04
1212
needs:
1313
- check-zig-cache-hash
1414
steps:
@@ -32,20 +32,13 @@ jobs:
3232
exit 1
3333
3434
check-zig-cache-hash:
35-
if: github.repository == 'ghostty-org/ghostty'
36-
runs-on: namespace-profile-ghostty-sm
35+
runs-on: ubuntu-24.04
3736
env:
38-
ZIG_LOCAL_CACHE_DIR: /zig/local-cache
39-
ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
37+
ZIG_LOCAL_CACHE_DIR: ${{ github.workspace }}/.zig-cache/local
38+
ZIG_GLOBAL_CACHE_DIR: ${{ github.workspace }}/.zig-cache/global
4039
steps:
4140
- name: Checkout code
4241
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
43-
- name: Setup Cache
44-
uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9 # v1.4.2
45-
with:
46-
path: |
47-
/nix
48-
/zig
4942
- name: Setup Nix
5043
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
5144
with:

.github/workflows/sync-upstream.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Sync with Upstream
33
on:
44
schedule:
55
# Run daily at 6am UTC
6-
- cron: '0 6 * * *'
6+
- cron: "0 6 * * *"
77
workflow_dispatch:
88
# Allow manual trigger
99

@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
with:
1717
fetch-depth: 0
1818
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)