An ATproto social media client -- with an independent Appview.
refactor(actions): better stats and indentation
+24
-24
+24
-24
.github/workflows/nightly-upstream-merge.yml
+24
-24
.github/workflows/nightly-upstream-merge.yml
···
110
110
owner: context.repo.owner,
111
111
repo: context.repo.repo,
112
112
issue_number: existingSyncPR.number,
113
-
body: `🔄 New upstream changes found!\n\n**New upstream SHA:** ${upstreamSha}\n**Additional commits:** ${commitCount}\n\nA new sync branch (\`${branchName}\`) has been created. You may want to close this PR and review the new one, or update this PR with the latest changes.`,
113
+
body: `🔄 New upstream changes found!\\n\nA new sync branch (\`${branchName}\`) has been created. You may want to close this PR and review the new one, or update this PR with the latest changes.`,
114
114
});
115
115
} else {
116
116
// Create new PR
···
118
118
const { data: pr } = await github.rest.pulls.create({
119
119
owner: context.repo.owner,
120
120
repo: context.repo.repo,
121
-
title: `Sync with upstream - ${commitCount} new commit${commitCount > 1 ? "s" : ""}`,
121
+
title: `Sync with upstream`,
122
122
head: branchName,
123
123
base: "main",
124
124
body: `## 🔄 Upstream Sync
125
125
126
-
This PR syncs the latest changes from upstream.
126
+
This PR syncs the latest changes from upstream.
127
127
128
-
**📊 Summary:**
129
-
- **Commits to sync:** ${commitCount}
130
-
- **Upstream SHA:** ${upstreamSha}
131
-
- **Generated:** ${new Date().toISOString()}
128
+
**📊 Summary:**
129
+
- **Commits to sync:** ${commitCount}
130
+
- **Upstream SHA:** ${upstreamSha}
131
+
- **Generated:** ${new Date().toISOString()}
132
132
133
-
**⚠️ Next Steps:**
134
-
1. Review the changes in this PR
135
-
2. Resolve any merge conflicts if present
136
-
3. Test the changes if needed
137
-
4. Merge when ready
133
+
**⚠️ Next Steps:**
134
+
1. Review the changes in this PR
135
+
2. Resolve any merge conflicts if present
136
+
3. Test the changes if needed
137
+
4. Merge when ready
138
138
139
-
**🔧 If there are conflicts:**
140
-
\`\`\`bash
141
-
git checkout ${branchName}
142
-
git merge main
143
-
# Resolve conflicts
144
-
git add .
145
-
git commit
146
-
git push origin ${branchName}
147
-
\`\`\`
139
+
**🔧 If there are conflicts:**
140
+
\`\`\`bash
141
+
git checkout ${branchName}
142
+
git merge main
143
+
# Resolve conflicts
144
+
git add .
145
+
git commit
146
+
git push origin ${branchName}
147
+
\`\`\`
148
148
149
-
---
150
-
*This PR was automatically generated by the upstream sync workflow.*`,
149
+
---
150
+
*This PR was automatically generated by the upstream sync workflow.*`,
151
151
draft: false,
152
152
});
153
153
···
166
166
(err.message.includes("No commits between") ||
167
167
err.message.includes("head and base are identical"))
168
168
) {
169
-
console.log(err.message);
169
+
console.log("No conflict found.", err.message);
170
170
}
171
171
}
172
172
}