3 Commits

Author SHA1 Message Date
8d6334d3b4 chore: release 26.1.5 2026-04-19 12:09:34 +02:00
dc8de5a4ea fix: skip release when HEAD is already a release commit 2026-04-19 12:07:53 +02:00
3510474764 fix: stop nested push in release hook 2026-04-19 12:07:08 +02:00
4 changed files with 23 additions and 21 deletions

16
Sparkle/appcast.xml vendored
View File

@@ -2,6 +2,14 @@
<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
<channel>
<title>iKeyMon</title>
<item>
<title>26.1.5</title>
<pubDate>Sun, 19 Apr 2026 12:09:33 +0200</pubDate>
<sparkle:version>173</sparkle:version>
<sparkle:shortVersionString>26.1.5</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.5/iKeyMon-26.1.5.zip" length="3065231" type="application/octet-stream" sparkle:edSignature="HVV7iZ4eyJC1VMh2q4GUoAESZnk4HoFU00QlA9qM4X4dJAT5oBEVB55m4wuF4u9iVFAeohkB0vleLlV39mxrBA=="/>
</item>
<item>
<title>26.1.3</title>
<pubDate>Sun, 19 Apr 2026 11:53:25 +0200</pubDate>
@@ -18,13 +26,5 @@
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.3/iKeyMon-26.1.3.zip" length="3007204" type="application/octet-stream" sparkle:edSignature="u8a/cDZFPV0a21y+1q7HpZjQQv8r7GtlrHqyinDtgI6jI5Sv5q26x0sTagPrmrwwydIj3hWFmHN/iYp/PomaCw=="/>
</item>
<item>
<title>26.1.2</title>
<pubDate>Sat, 03 Jan 2026 18:05:27 +0100</pubDate>
<sparkle:version>164</sparkle:version>
<sparkle:shortVersionString>26.1.2</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.2/iKeyMon-26.1.2.zip" length="3007173" type="application/octet-stream" sparkle:edSignature="CiNeGZ9h4WtI/ZOW371EAEKGK0vWdu1VhBk5ewh2hoq+4C8R9DbnQvDyHvwFy4wh6VpLahp/mXr4gV5alEIRCw=="/>
</item>
</channel>
</rss>

View File

@@ -11,6 +11,12 @@ if [[ -n "${SKIP_RELEASE:-}" ]]; then
exit 0
fi
head_subject="$(git -C "$ROOT_DIR" log -1 --pretty=%s 2>/dev/null || true)"
if [[ "$head_subject" =~ ^chore:\ release\ ]]; then
echo "release: skipped (HEAD is already a release commit)"
exit 0
fi
should_release=false
release_local_ref=""
release_remote_ref=""
@@ -67,7 +73,8 @@ fi
git -C "$ROOT_DIR" add "$ROOT_DIR/version.json" "$ROOT_DIR/iKeyMon.xcodeproj/project.pbxproj" "$ROOT_DIR/Sparkle/appcast.xml"
if git -C "$ROOT_DIR" diff --cached --quiet; then
echo "release: no changes detected; skipping commit"
echo "release: no changes detected; continuing push"
exit 0
else
run_logged git -C "$ROOT_DIR" commit -m "chore: release ${NEW_VERSION}" || {
echo "release: commit failed (log: $RELEASE_LOG)"
@@ -75,10 +82,5 @@ else
}
fi
if SKIP_RELEASE=1 git -C "$ROOT_DIR" push --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
echo "release: success v${NEW_VERSION} (release commit already pushed; stopping original push)"
echo "release: created commit for v${NEW_VERSION}; run 'git push' again to push the new release commit"
exit 1
else
echo "release: push failed (log: $RELEASE_LOG)"
exit 1
fi

View File

@@ -322,7 +322,7 @@
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 170;
CURRENT_PROJECT_VERSION = 173;
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
DEVELOPMENT_TEAM = Q5486ZVAFT;
ENABLE_HARDENED_RUNTIME = YES;
@@ -337,7 +337,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 26.1.4;
MARKETING_VERSION = 26.1.5;
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -353,7 +353,7 @@
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 170;
CURRENT_PROJECT_VERSION = 173;
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
DEVELOPMENT_TEAM = Q5486ZVAFT;
ENABLE_HARDENED_RUNTIME = YES;
@@ -368,7 +368,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 26.1.4;
MARKETING_VERSION = 26.1.5;
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;

View File

@@ -1,3 +1,3 @@
{
"marketing_version": "26.1.4"
"marketing_version": "26.1.5"
}