Skip to content

Commit a5c35d9

Browse files
committed
fix(ci): handle dirty workspace on self-hosted runner re-runs
Add clean: true to checkout and git stash around branch switch in appcast commit step. Prevents failure when a previous run left modified appcast.xml in the workspace. Bump version to 20260313.1.
1 parent 9b4a8a5 commit a5c35d9

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
with:
3232
submodules: recursive
3333
fetch-depth: 0
34+
clean: true
3435

3536
- name: Set up Xcode
3637
uses: maxim-lobanov/setup-xcode@v1
@@ -115,10 +116,13 @@ jobs:
115116
git config user.name "GitHub Actions"
116117
git config user.email "actions@github.com"
117118
118-
# Fetch latest main and switch to it
119+
# Stash local changes (e.g. appcast.xml from update step)
120+
# so we can cleanly switch to main
121+
git stash --include-untracked || true
119122
git fetch origin main
120123
git checkout main
121124
git pull origin main
125+
git stash pop || true
122126
123127
git add appcast.xml
124128
if git diff --staged --quiet; then

Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>20260312.1</string>
22+
<string>20260313.1</string>
2323
<key>CFBundleVersion</key>
24-
<string>20260312.1</string>
24+
<string>20260313.1</string>
2525
<key>LSApplicationCategoryType</key>
2626
<string>public.app-category.productivity</string>
2727
<key>LSMinimumSystemVersion</key>

Resources/whats-new.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"releases": [
33
{
4-
"version": "20260312.1",
5-
"release_date": "March 12, 2026",
4+
"version": "20260313.1",
5+
"release_date": "March 13, 2026",
66
"highlights": [
77
{
88
"id": "alice-image-generation",

0 commit comments

Comments
 (0)