Skip to content

Commit 234f334

Browse files
committed
ci: use shared workflows for create release workflow (#1103)
1 parent 49b976d commit 234f334

File tree

1 file changed

+30
-185
lines changed

1 file changed

+30
-185
lines changed

.github/workflows/create-release-pr.yml

Lines changed: 30 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
required: false
1818
type: string
1919

20-
# For making a release pr from cordova github actions
20+
#For making a release pr from cordova github actions.
2121
workflow_dispatch:
2222
inputs:
2323
cordova_version:
@@ -34,18 +34,25 @@ on:
3434
type: string
3535

3636
jobs:
37+
prep:
38+
uses: OneSignal/sdk-actions/.github/workflows/prep-release.yml@main
39+
with:
40+
version: ${{ inputs.cordova_version }}
41+
42+
# Cordova specific steps
3743
update-version:
44+
needs: prep
3845
runs-on: macos-latest
39-
40-
env:
41-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
outputs:
47+
cordova_from: ${{ steps.current_versions.outputs.cordova_from }}
48+
android_from: ${{ steps.current_versions.outputs.android_from }}
49+
ios_from: ${{ steps.current_versions.outputs.ios_from }}
4250

4351
steps:
4452
- name: Checkout
4553
uses: actions/checkout@v5
4654
with:
47-
fetch-depth: 0
48-
fetch-tags: true
55+
ref: ${{ needs.prep.outputs.release_branch }}
4956

5057
- name: Setup Bun
5158
uses: oven-sh/setup-bun@v2
@@ -55,97 +62,22 @@ jobs:
5562
- name: Install
5663
run: bun install --frozen-lockfile
5764

58-
- name: Get release type
59-
id: release_type
60-
run: |
61-
NEW_VERSION="${{ inputs.cordova_version }}"
62-
if [[ "$NEW_VERSION" =~ -alpha ]]; then
63-
echo "release-type=Alpha" >> $GITHUB_OUTPUT
64-
elif [[ "$NEW_VERSION" =~ -beta ]]; then
65-
echo "release-type=Beta" >> $GITHUB_OUTPUT
66-
else
67-
echo "release-type=Current" >> $GITHUB_OUTPUT
68-
fi
69-
70-
- name: Get last release commit
71-
id: last_commit
72-
run: |
73-
CURRENT_VERSION=$(bun -e "console.log(require('./package.json').version)")
74-
LAST_RELEASE_DATE=$(git show -s --format=%cI "$CURRENT_VERSION")
75-
echo "date=$LAST_RELEASE_DATE" >> $GITHUB_OUTPUT
76-
77-
- name: Release branch name
78-
id: release_branch
79-
run: |
80-
# Omit alpha/beta version e.g. 5.2.15-beta.1 -> 5.2.15-beta
81-
BRANCH_VERSION=$(echo "${{ inputs.cordova_version }}" | sed 's/\(-[a-z]*\)\.[0-9]*$/\1/')
82-
echo "releaseBranch=rel/$BRANCH_VERSION" >> $GITHUB_OUTPUT
83-
84-
- name: Create release branch
85-
run: |
86-
releaseBranch="${{ steps.release_branch.outputs.releaseBranch }}"
87-
releaseType="${{ steps.release_type.outputs.release-type }}"
88-
89-
if ! git checkout -b "$releaseBranch" 2>/dev/null; then
90-
# Branch already exists
91-
if [[ "$releaseType" == "Current" ]]; then
92-
echo "Error: Release branch already exists for Current release"
93-
exit 1
94-
fi
95-
# For Alpha/Beta, use existing branch
96-
git checkout "$releaseBranch"
97-
fi
98-
git push -u origin "$releaseBranch"
99-
100-
- name: Get merged PRs
101-
id: get_prs
102-
uses: actions/github-script@v8
103-
with:
104-
script: |
105-
const lastReleaseDate = '${{ steps.last_commit.outputs.date }}';
106-
const releaseBranch = '${{ steps.release_branch.outputs.releaseBranch }}';
107-
108-
// Get the creation date of the release branch (when it diverged from main)
109-
const { data: branchInfo } = await github.rest.repos.getBranch({
110-
owner: context.repo.owner,
111-
repo: context.repo.repo,
112-
branch: releaseBranch
113-
});
114-
const branchCreatedAt = branchInfo.commit.commit.committer.date;
115-
116-
// Get PRs merged to main since last release but BEFORE release branch was created
117-
const { data: prs } = await github.rest.pulls.list({
118-
owner: context.repo.owner,
119-
repo: context.repo.repo,
120-
state: 'closed',
121-
base: 'main',
122-
per_page: 100
123-
});
124-
125-
const mergedPrs = prs
126-
.filter(pr =>
127-
pr.merged_at &&
128-
new Date(pr.merged_at) > new Date(lastReleaseDate) &&
129-
new Date(pr.merged_at) <= new Date(branchCreatedAt) // Only before branch creation
130-
)
131-
.map(pr => ({
132-
number: pr.number,
133-
title: pr.title,
134-
}));
135-
core.setOutput('prs', JSON.stringify(mergedPrs));
13665
- name: Get current native SDK versions
13766
id: current_versions
13867
run: |
68+
# Current cordova version
69+
CURRENT_VERSION=$(jq -r .version package.json)
70+
13971
# Extract current Android SDK version
14072
ANDROID_VERSION=$(sed -n 's/.*com\.onesignal:OneSignal:\([0-9.]*\).*/\1/p' plugin.xml | head -1)
14173
14274
# Extract current iOS SDK version
14375
IOS_VERSION=$(sed -n 's/.*OneSignalXCFramework.*spec="\([0-9.]*\)".*/\1/p' plugin.xml | head -1)
14476
145-
echo "prev_android=$ANDROID_VERSION" >> $GITHUB_OUTPUT
146-
echo "prev_ios=$IOS_VERSION" >> $GITHUB_OUTPUT
77+
echo "cordova_from=$CURRENT_VERSION" >> $GITHUB_OUTPUT
78+
echo "android_from=$ANDROID_VERSION" >> $GITHUB_OUTPUT
79+
echo "ios_from=$IOS_VERSION" >> $GITHUB_OUTPUT
14780
148-
# Cordova specific steps
14981
- name: Setup Capacitor
15082
run: |
15183
bun link
@@ -231,101 +163,14 @@ jobs:
231163
git commit -m "Release $NEW_VERSION"
232164
git push
233165
234-
- name: Document native sdk changes
235-
id: native_deps
236-
run: |
237-
# Get the current plugin.xml
238-
CURRENT_PLUGIN=$(cat plugin.xml)
239-
240-
# Extract current Android SDK version
241-
ANDROID_VERSION=$(sed -n 's/.*com\.onesignal:OneSignal:\([0-9.]*\).*/\1/p' <<< "$CURRENT_PLUGIN" | head -1)
242-
PREVIOUS_ANDROID="${{ steps.current_versions.outputs.prev_android }}"
243-
244-
# Extract current iOS SDK version
245-
IOS_VERSION=$(sed -n 's/.*OneSignalXCFramework.*spec="\([0-9.]*\)".*/\1/p' <<< "$CURRENT_PLUGIN" | head -1)
246-
PREVIOUS_IOS="${{ steps.current_versions.outputs.prev_ios }}"
247-
248-
# Build output for native dependency changes
249-
NATIVE_UPDATES=""
250-
if [[ "$ANDROID_VERSION" != "$PREVIOUS_ANDROID" && ! -z "$PREVIOUS_ANDROID" ]]; then
251-
printf -v NATIVE_UPDATES '%sANDROID_UPDATE=true\nANDROID_FROM=%s\nANDROID_TO=%s\n' "$NATIVE_UPDATES" "$PREVIOUS_ANDROID" "$ANDROID_VERSION"
252-
fi
253-
254-
if [[ "$IOS_VERSION" != "$PREVIOUS_IOS" && ! -z "$PREVIOUS_IOS" ]]; then
255-
printf -v NATIVE_UPDATES '%sIOS_UPDATE=true\nIOS_FROM=%s\nIOS_TO=%s\n' "$NATIVE_UPDATES" "$PREVIOUS_IOS" "$IOS_VERSION"
256-
fi
257-
258-
# Output the variables
259-
echo "$NATIVE_UPDATES" >> $GITHUB_OUTPUT
260-
261-
- name: Generate release notes
262-
id: release_notes
263-
uses: actions/github-script@v8
264-
with:
265-
script: |
266-
// Trim whitespace from PR titles
267-
const prs = JSON.parse('${{ steps.get_prs.outputs.prs }}').map(pr => ({
268-
...pr,
269-
title: pr.title.trim()
270-
}));
271-
272-
// Categorize PRs (exclude internal changes like ci/chore)
273-
const features = prs.filter(pr => /^feat/i.test(pr.title));
274-
const fixes = prs.filter(pr => /^fix/i.test(pr.title));
275-
const improvements = prs.filter(pr => /^(perf|refactor)/i.test(pr.title));
276-
277-
// Helper function to build section
278-
const buildSection = (title, prs) => {
279-
if (prs.length === 0) return '';
280-
let section = `### ${title}\n\n`;
281-
prs.forEach(pr => {
282-
section += `- ${pr.title} (#${pr.number})\n`;
283-
});
284-
return section + '\n';
285-
};
286-
287-
let releaseNotes = `Channels: ${{ steps.release_type.outputs.release-type }}\n\n`;
288-
releaseNotes += buildSection('🚀 New Features', features);
289-
releaseNotes += buildSection('🐛 Bug Fixes', fixes);
290-
releaseNotes += buildSection('✨ Improvements', improvements);
291-
292-
// Check for native dependency changes
293-
const hasAndroidUpdate = '${{ steps.native_deps.outputs.ANDROID_UPDATE }}' === 'true';
294-
const hasIosUpdate = '${{ steps.native_deps.outputs.IOS_UPDATE }}' === 'true';
295-
296-
if (hasAndroidUpdate || hasIosUpdate) {
297-
releaseNotes += '\n### 🛠️ Native Dependency Updates\n\n';
298-
if (hasAndroidUpdate) {
299-
releaseNotes += `- Update Android SDK from ${{ steps.native_deps.outputs.ANDROID_FROM }} to ${{ steps.native_deps.outputs.ANDROID_TO }}\n`;
300-
releaseNotes += ` - See [release notes](https://github.com/OneSignal/OneSignal-Android-SDK/releases) for full details\n`;
301-
}
302-
if (hasIosUpdate) {
303-
releaseNotes += `- Update iOS SDK from ${{ steps.native_deps.outputs.IOS_FROM }} to ${{ steps.native_deps.outputs.IOS_TO }}\n`;
304-
releaseNotes += ` - See [release notes](https://github.com/OneSignal/OneSignal-iOS-SDK/releases) for full details\n`;
305-
}
306-
releaseNotes += '\n';
307-
}
308-
309-
core.setOutput('notes', releaseNotes);
310-
311-
- name: Create release PR
312-
run: |
313-
NEW_VERSION="${{ inputs.cordova_version }}"
314-
RELEASE_TYPE="${{ steps.release_type.outputs.release-type }}"
315-
316-
# Determine base branch based on release type
317-
if [[ "$RELEASE_TYPE" == "Current" ]]; then
318-
BASE_BRANCH="main"
319-
else
320-
BASE_BRANCH="${{ steps.release_branch.outputs.releaseBranch }}"
321-
fi
322-
323-
# Write release notes to file to avoid shell interpretation
324-
cat > release_notes.md << 'EOF'
325-
${{ steps.release_notes.outputs.notes }}
326-
EOF
327-
328-
gh pr create \
329-
--title "chore: Release $NEW_VERSION" \
330-
--body-file release_notes.md \
331-
--base "$BASE_BRANCH"
166+
create-pr:
167+
needs: [prep, update-version]
168+
uses: OneSignal/sdk-actions/.github/workflows/create-release.yml@main
169+
with:
170+
release_branch: ${{ needs.prep.outputs.release_branch }}
171+
version_from: ${{ needs.update-version.outputs.cordova_from }}
172+
version_to: ${{ inputs.cordova_version }}
173+
android_from: ${{ needs.update-version.outputs.android_from }}
174+
android_to: ${{ inputs.android_version }}
175+
ios_from: ${{ needs.update-version.outputs.ios_from }}
176+
ios_to: ${{ inputs.ios_version }}

0 commit comments

Comments
 (0)