Skip to content

Commit 7347157

Browse files
gaborbernatgaborbernat
committed
🐛 fix(app): remove settings freeze
Signed-off-by: BernĂĄt GĂĄbor <gaborjbernat@gmail.com>
1 parent 8f9a543 commit 7347157

121 files changed

Lines changed: 5262 additions & 1083 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
name: Lint
1919
runs-on: macos-26
2020
steps:
21-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
21+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2222
with:
2323
persist-credentials: false
24-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
24+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
2525
- name: Select Xcode
2626
run: Scripts/select-xcode.sh
2727
- name: Run every hook
@@ -44,7 +44,7 @@ jobs:
4444
runner: ${{ vars.XCODE_27_RUNNER || 'xcode-27' }}
4545
minimum-xcode: 27
4646
steps:
47-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
47+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4848
with:
4949
persist-credentials: false
5050
- name: Select Xcode
@@ -57,32 +57,32 @@ jobs:
5757
version="$(xcodebuild -version | tr '\n' '-')"
5858
echo "cache=$(printf '%s' "$version" | shasum -a 256 | cut -c 1-12)" >> "$GITHUB_OUTPUT"
5959
- name: Cache SwiftPM
60-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
60+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
6161
with:
6262
path: .build
6363
key: spm-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runner }}-${{ steps.xcode.outputs.cache }}-${{ hashFiles('Package.swift')
6464
}}
6565
- name: Build
6666
run: swift build
6767
- name: Test
68-
run: swift test
68+
run: swift test --no-parallel
6969

7070
coverage:
7171
name: Tests and coverage (macOS 26)
7272
runs-on: macos-26
7373
steps:
74-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
74+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7575
with:
7676
persist-credentials: false
77-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
77+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
7878
- name: Select Xcode
7979
id: xcode
8080
run: |
8181
Scripts/select-xcode.sh
8282
version="$(xcodebuild -version | tr '\n' '-')"
8383
echo "cache=$(printf '%s' "$version" | shasum -a 256 | cut -c 1-12)" >> "$GITHUB_OUTPUT"
8484
- name: Cache SwiftPM
85-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
85+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
8686
with:
8787
path: .build
8888
key: spm-${{ runner.os }}-${{ runner.arch }}-macos-26-${{ steps.xcode.outputs.cache }}-${{ hashFiles('Package.swift')
@@ -112,10 +112,10 @@ jobs:
112112
runner: ${{ vars.XCODE_27_RUNNER || 'xcode-27' }}
113113
minimum-xcode: 27
114114
steps:
115-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
115+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
116116
with:
117117
persist-credentials: false
118-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
118+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
119119
- name: Select Xcode
120120
id: xcode
121121
env:
@@ -126,7 +126,7 @@ jobs:
126126
version="$(xcodebuild -version | tr '\n' '-')"
127127
echo "cache=$(printf '%s' "$version" | shasum -a 256 | cut -c 1-12)" >> "$GITHUB_OUTPUT"
128128
- name: Cache Xcode packages
129-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
129+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
130130
with:
131131
path: .build/xcode-packages
132132
key: xcode-spm-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runner }}-${{ steps.xcode.outputs.cache }}-${{ hashFiles('Package.swift',
@@ -152,7 +152,7 @@ jobs:
152152
runner: macos-26
153153
minimum-xcode: 26
154154
scheme: TokenMenuBar-Direct
155-
target: TokenMenuBar
155+
target: TokenMenuBarDirect
156156
configuration: Release
157157
distribution: Direct
158158
condition: DIRECT
@@ -185,7 +185,7 @@ jobs:
185185
runner: ${{ vars.XCODE_27_RUNNER || 'xcode-27' }}
186186
minimum-xcode: 27
187187
scheme: TokenMenuBar-Direct
188-
target: TokenMenuBar
188+
target: TokenMenuBarDirect
189189
configuration: Release
190190
distribution: Direct
191191
condition: DIRECT
@@ -215,10 +215,10 @@ jobs:
215215
entitlements: Direct.entitlements
216216
updater: forbidden
217217
steps:
218-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
218+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
219219
with:
220220
persist-credentials: false
221-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
221+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
222222
- name: Select Xcode
223223
id: xcode
224224
env:
@@ -229,7 +229,7 @@ jobs:
229229
version="$(xcodebuild -version | tr '\n' '-')"
230230
echo "cache=$(printf '%s' "$version" | shasum -a 256 | cut -c 1-12)" >> "$GITHUB_OUTPUT"
231231
- name: Cache Xcode packages
232-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
232+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
233233
with:
234234
path: .build/xcode-packages
235235
key: xcode-spm-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runner }}-${{ steps.xcode.outputs.cache }}-${{ hashFiles('Package.swift',
@@ -270,7 +270,7 @@ jobs:
270270
ditto -c -k --keepParent "$app" .build/token-menu-bar-macos-14-smoke.zip
271271
- name: Upload the macOS 14 smoke artifact
272272
if: matrix.runner == 'macos-26' && matrix.scheme == 'TokenMenuBar-Direct'
273-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
273+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
274274
with:
275275
name: token-menu-bar-macos-14-smoke
276276
path: .build/token-menu-bar-macos-14-smoke.zip
@@ -282,7 +282,7 @@ jobs:
282282
needs: application
283283
runs-on: ${{ vars.MACOS_14_RUNTIME_RUNNER || 'macos-14' }}
284284
steps:
285-
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
285+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
286286
with:
287287
name: token-menu-bar-macos-14-smoke
288288
path: smoke
@@ -292,9 +292,10 @@ jobs:
292292
executable="smoke/app/Token Menu Bar.app/Contents/MacOS/Token Menu Bar"
293293
runtime="$PWD/smoke/runtime"
294294
session="macos-14-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
295-
ready="$runtime/token-menu-bar-verify-$session/snapshots-demo.json"
296-
mkdir -p "$runtime"
297-
TMPDIR="$runtime/" TOKEN_MENU_BAR_VERIFY_SESSION="$session" \
295+
support="$runtime/token-menu-bar-verify-$session"
296+
ready="$support/snapshots-demo.json"
297+
mkdir -p "$support"
298+
TOKEN_MENU_BAR_VERIFY_SESSION="$session" TOKEN_MENU_BAR_VERIFY_SUPPORT_DIRECTORY="$support" \
298299
"$executable" --verify-ui >smoke/launch.log 2>&1 &
299300
pid=$!
300301
for _ in {1..80}; do
@@ -309,24 +310,23 @@ jobs:
309310
done
310311
if ! grep -Fq '"claude"' "$ready" 2>/dev/null || ! grep -Fq '"codex"' "$ready" 2>/dev/null; then
311312
cat smoke/launch.log
312-
test ! -f "$runtime/token-menu-bar-verify-$session/log.txt" \
313-
|| cat "$runtime/token-menu-bar-verify-$session/log.txt"
313+
test ! -f "$support/log.txt" || cat "$support/log.txt"
314314
kill "$pid" 2>/dev/null || true
315315
wait "$pid" || true
316316
exit 1
317317
fi
318-
kill "$pid"
318+
kill "$pid" 2>/dev/null || true
319319
wait "$pid" || true
320320
321321
macos-27-runtime:
322322
name: Application UI (macOS 27 runtime)
323323
if: vars.MACOS_27_RUNTIME_RUNNER != ''
324324
runs-on: ${{ vars.MACOS_27_RUNTIME_RUNNER }}
325325
steps:
326-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
326+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
327327
with:
328328
persist-credentials: false
329-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
329+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
330330
- name: Select Xcode
331331
env:
332332
MIN_XCODE_MAJOR: 27

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
name: Build the site
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
23+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2424
with:
2525
persist-credentials: false
26-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
26+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
2727
# Read the Docs publishes the site; this only has to fail when a template or a shortcode breaks.
2828
- name: Build
2929
run: just site

‎.github/workflows/prepare-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
outputs:
2727
version: ${{ steps.version.outputs.next }}
2828
steps:
29-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
29+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3030
with:
3131
fetch-depth: 0
3232
persist-credentials: true

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ jobs:
8686
needs: preflight
8787
runs-on: ${{ vars.MACOS_27_RUNTIME_RUNNER }}
8888
steps:
89-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
89+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9090
with:
9191
ref: ${{ env.TAG }}
9292
persist-credentials: false
93-
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
93+
- uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
9494
with:
9595
cache: false
9696
- name: Select Xcode
@@ -118,7 +118,7 @@ jobs:
118118
outputs:
119119
signed: ${{ steps.identity.outputs.signed }}
120120
steps:
121-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
121+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
122122
with:
123123
ref: ${{ env.TAG }}
124124
persist-credentials: false
@@ -206,7 +206,7 @@ jobs:
206206
- name: Update Homebrew cask file
207207
run: Scripts/update-cask.sh "${TAG#v}" dist/homebrew/TokenMenuBar-Homebrew.dmg
208208
- name: Upload artifacts
209-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
209+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
210210
with:
211211
name: downloads
212212
path: |
@@ -265,7 +265,7 @@ jobs:
265265
contents: read
266266
if: needs.preflight.outputs.app_store == 'true'
267267
steps:
268-
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
268+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
269269
with:
270270
ref: ${{ env.TAG }}
271271
persist-credentials: false

‎App/TokenMenuBar.xctestplan‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"configurations" : [
3+
{
4+
"id" : "3844B410-3635-4A9B-80D0-A65177767161",
5+
"name" : "Test Scheme Action",
6+
"options" : {
7+
8+
}
9+
}
10+
],
11+
"defaultOptions" : {
12+
"targetForVariableExpansion" : {
13+
"containerPath" : "container:TokenMenuBar.xcodeproj",
14+
"identifier" : "EDE813082ECDC0E560455657",
15+
"name" : "TokenMenuBarDirect"
16+
}
17+
},
18+
"testTargets" : [
19+
{
20+
"parallelizable" : false,
21+
"target" : {
22+
"containerPath" : "container:TokenMenuBar.xcodeproj",
23+
"identifier" : "0C919F3E9C6CF2D0B315AEC5",
24+
"name" : "TokenMenuBarApplicationUITests"
25+
}
26+
}
27+
],
28+
"version" : 1
29+
}

0 commit comments

Comments
 (0)