Skip to content

Commit ae9cc2d

Browse files
devopsmariocomdevopsmariocom
committed
Update build-and-release workflow and Info.plist for versioning improvements
🔧 Workflow Enhancements: - Adjusted appcast.xml generation logic to correctly reference releases/releases.atom. - Improved logging for appcast.xml generation success messages. 📱 Info.plist Updates: - Updated CFBundleShortVersionString to v1.0.50. - Revised CFBundleVersion and GitHash for accurate version tracking. These changes enhance the build process and ensure accurate version information is reflected in the application.
1 parent 8b8052e commit ae9cc2d

5 files changed

Lines changed: 184 additions & 7 deletions

File tree

‎.github/workflows/build-and-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,13 +247,13 @@ jobs:
247247
--full-release-notes-url "https://github.com/devopsmariocom/A6Cutter/releases" \
248248
releases/
249249
250-
# Move appcast.xml to root (generate_appcast creates releases.atom)
250+
# Move appcast.xml to root (generate_appcast creates releases.atom in releases/ directory)
251251
if [ -f "releases/appcast.xml" ]; then
252252
mv releases/appcast.xml .
253253
echo "✅ appcast.xml generated successfully!"
254-
elif [ -f "releases.atom" ]; then
255-
mv releases.atom appcast.xml
256-
echo "✅ appcast.xml generated successfully (from releases.atom)!"
254+
elif [ -f "releases/releases.atom" ]; then
255+
mv releases/releases.atom appcast.xml
256+
echo "✅ appcast.xml generated successfully (from releases/releases.atom)!"
257257
else
258258
echo "❌ Failed to generate appcast.xml"
259259
echo "📁 Available files in releases/:"

‎A6Cutter/Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<key>CFBundlePackageType</key>
1414
<string>APPL</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>v1.0.31-dev</string>
16+
<string>v1.0.50</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>34a6b8f</string>
20+
<string>42</string>
2121
<key>GitHash</key>
22-
<string>34a6b8f41c3bff929b34f6b62b01c0088d873435</string>
22+
<string>8b8052ebb28a6424e2a95938f2439b7144d1a4ee</string>
2323
<key>LSMinimumSystemVersion</key>
2424
<string>14.0</string>
2525
<key>NSHumanReadableCopyright</key>

‎Dockerfile.test‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# Dockerfile for testing GitHub Actions workflow locally
2+
FROM macos:latest
3+
4+
# Install required tools
5+
RUN apt-get update && apt-get install -y \
6+
curl \
7+
jq \
8+
git \
9+
xcodebuild \
10+
hdiutil \
11+
plutil \
12+
&& rm -rf /var/lib/apt/lists/*
13+
14+
# Set working directory
15+
WORKDIR /workspace
16+
17+
# Copy project files
18+
COPY . .
19+
20+
# Set up environment variables for testing
21+
ENV GITHUB_REF=refs/tags/v1.0.50
22+
ENV GITHUB_RUN_NUMBER=42
23+
ENV GITHUB_EVENT_NAME=push
24+
25+
# Run the workflow steps
26+
RUN echo "🔧 Testing GitHub Actions workflow locally..."
27+
28+
# Step 1: Get version and hash info
29+
RUN echo "📝 Getting version and hash info..." && \
30+
if [[ $GITHUB_REF == refs/tags/* ]]; then \
31+
VERSION=${GITHUB_REF#refs/tags/}; \
32+
else \
33+
VERSION=dev-$(date +%Y%m%d-%H%M%S); \
34+
fi && \
35+
GIT_HASH=$(git rev-parse HEAD) && \
36+
GIT_HASH_SHORT=$(git rev-parse --short HEAD) && \
37+
echo "VERSION=$VERSION" && \
38+
echo "GIT_HASH=$GIT_HASH" && \
39+
echo "GIT_HASH_SHORT=$GIT_HASH_SHORT"
40+
41+
# Step 2: Update Info.plist
42+
RUN echo "📝 Updating Info.plist..." && \
43+
INFO_PLIST="A6Cutter/Info.plist" && \
44+
echo "📄 Current Info.plist content:" && \
45+
plutil -p "$INFO_PLIST" | grep -E "(CFBundleShortVersionString|CFBundleVersion|GitHash)" || echo "No version info found" && \
46+
echo "🔧 Updating CFBundleShortVersionString to: v1.0.50" && \
47+
plutil -replace CFBundleShortVersionString -string "v1.0.50" "$INFO_PLIST" && \
48+
echo "🔧 Updating CFBundleVersion to: 42" && \
49+
plutil -replace CFBundleVersion -string "42" "$INFO_PLIST" && \
50+
echo "🔧 Updating GitHash to: a1b2c3d4e5f6789012345678901234567890abcd" && \
51+
plutil -replace GitHash -string "a1b2c3d4e5f6789012345678901234567890abcd" "$INFO_PLIST" && \
52+
echo "📄 Updated Info.plist content:" && \
53+
plutil -p "$INFO_PLIST" | grep -E "(CFBundleShortVersionString|CFBundleVersion|GitHash)"
54+
55+
# Step 3: Test appcast generation (simulate)
56+
RUN echo "📡 Testing appcast generation..." && \
57+
mkdir -p releases && \
58+
echo "Test DMG content" > releases/A6Cutter-v1.0.50.dmg && \
59+
echo "Test appcast content" > releases/releases.atom && \
60+
echo "📁 Available files in releases/:" && \
61+
ls -la releases/ && \
62+
if [ -f "releases/releases.atom" ]; then \
63+
mv releases/releases.atom appcast.xml && \
64+
echo "✅ appcast.xml generated successfully (from releases/releases.atom)!"; \
65+
else \
66+
echo "❌ Failed to generate appcast.xml"; \
67+
exit 1; \
68+
fi
69+
70+
# Step 4: Verify final result
71+
RUN echo "📋 Final verification:" && \
72+
echo "📄 Info.plist content:" && \
73+
plutil -p A6Cutter/Info.plist | grep -E "(CFBundleShortVersionString|CFBundleVersion|GitHash)" && \
74+
echo "📄 appcast.xml exists:" && \
75+
ls -la appcast.xml && \
76+
echo "✅ All tests passed!"
77+
78+
CMD ["echo", "Docker test completed successfully!"]
79+

‎test-github-actions-local.sh‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
#!/bin/bash
2+
3+
# Test script for GitHub Actions workflow locally
4+
set -e
5+
6+
echo "🧪 Testing GitHub Actions workflow locally..."
7+
8+
# Set up test environment
9+
export GITHUB_REF=refs/tags/v1.0.50
10+
export GITHUB_RUN_NUMBER=42
11+
export GITHUB_EVENT_NAME=push
12+
13+
echo "📝 Step 1: Getting version and hash info..."
14+
if [[ $GITHUB_REF == refs/tags/* ]]; then
15+
VERSION=${GITHUB_REF#refs/tags/}
16+
else
17+
VERSION=dev-$(date +%Y%m%d-%H%M%S)
18+
fi
19+
20+
GIT_HASH=$(git rev-parse HEAD)
21+
GIT_HASH_SHORT=$(git rev-parse --short HEAD)
22+
23+
echo "VERSION=$VERSION"
24+
echo "GIT_HASH=$GIT_HASH"
25+
echo "GIT_HASH_SHORT=$GIT_HASH_SHORT"
26+
27+
echo "📝 Step 2: Updating Info.plist..."
28+
INFO_PLIST="A6Cutter/Info.plist"
29+
30+
echo "📄 Current Info.plist content:"
31+
plutil -p "$INFO_PLIST" | grep -E "(CFBundleShortVersionString|CFBundleVersion|GitHash)" || echo "No version info found"
32+
33+
echo "🔧 Updating CFBundleShortVersionString to: $VERSION"
34+
plutil -replace CFBundleShortVersionString -string "$VERSION" "$INFO_PLIST"
35+
36+
echo "🔧 Updating CFBundleVersion to: $GITHUB_RUN_NUMBER"
37+
plutil -replace CFBundleVersion -string "$GITHUB_RUN_NUMBER" "$INFO_PLIST"
38+
39+
echo "🔧 Updating GitHash to: $GIT_HASH"
40+
plutil -replace GitHash -string "$GIT_HASH" "$INFO_PLIST"
41+
42+
echo "📄 Updated Info.plist content:"
43+
plutil -p "$INFO_PLIST" | grep -E "(CFBundleShortVersionString|CFBundleVersion|GitHash)"
44+
45+
echo "📡 Step 3: Testing appcast generation..."
46+
mkdir -p releases
47+
echo "Test DMG content" > releases/A6Cutter-$VERSION.dmg
48+
echo "Test appcast content" > releases/releases.atom
49+
50+
echo "📁 Available files in releases/:"
51+
ls -la releases/
52+
53+
# Test the appcast.xml generation logic
54+
if [ -f "releases/appcast.xml" ]; then
55+
mv releases/appcast.xml .
56+
echo "✅ appcast.xml generated successfully!"
57+
elif [ -f "releases/releases.atom" ]; then
58+
mv releases/releases.atom appcast.xml
59+
echo "✅ appcast.xml generated successfully (from releases/releases.atom)!"
60+
else
61+
echo "❌ Failed to generate appcast.xml"
62+
echo "📁 Available files in releases/:"
63+
ls -la releases/ || echo "No releases directory found"
64+
echo "📁 Available files in current directory:"
65+
ls -la *.xml *.atom 2>/dev/null || echo "No XML/ATOM files found"
66+
exit 1
67+
fi
68+
69+
echo "📋 Step 4: Final verification..."
70+
echo "📄 Info.plist content:"
71+
plutil -p A6Cutter/Info.plist | grep -E "(CFBundleShortVersionString|CFBundleVersion|GitHash)"
72+
73+
echo "📄 appcast.xml exists:"
74+
ls -la appcast.xml
75+
76+
echo "✅ All tests passed!"
77+
78+
# Cleanup
79+
rm -rf releases/
80+
rm -f appcast.xml
81+
82+
echo "🧹 Cleanup completed!"
83+

‎test-github-actions.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
# Test script for GitHub Actions workflow using Docker
4+
set -e
5+
6+
echo "🐳 Testing GitHub Actions workflow with Docker..."
7+
8+
# Build and run Docker container
9+
docker build -f Dockerfile.test -t a6cutter-test .
10+
11+
# Run the test
12+
docker run --rm a6cutter-test
13+
14+
echo "✅ Docker test completed!"
15+

0 commit comments

Comments
 (0)