httpcat-cli 0.2.7 → 0.2.8-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/release.yml +23 -1
- package/bun.lock +0 -1
- package/package.json +1 -1
|
@@ -96,6 +96,18 @@ jobs:
|
|
|
96
96
|
if (context.eventName === 'push' && context.payload.before) {
|
|
97
97
|
console.log(`Analyzing commits in this push (${context.payload.before}..${context.sha})...`);
|
|
98
98
|
try {
|
|
99
|
+
// First, verify both commits exist
|
|
100
|
+
try {
|
|
101
|
+
await github.rest.repos.getCommit({
|
|
102
|
+
owner: context.repo.owner,
|
|
103
|
+
repo: context.repo.repo,
|
|
104
|
+
ref: context.payload.before
|
|
105
|
+
});
|
|
106
|
+
} catch (e) {
|
|
107
|
+
console.log(`⚠️ Base commit ${context.payload.before} not found (may have been squashed/rebased), falling back to last release`);
|
|
108
|
+
throw new Error(`Base commit not found: ${e.message}`);
|
|
109
|
+
}
|
|
110
|
+
|
|
99
111
|
const response = await github.rest.repos.compareCommits({
|
|
100
112
|
owner: context.repo.owner,
|
|
101
113
|
repo: context.repo.repo,
|
|
@@ -117,7 +129,7 @@ jobs:
|
|
|
117
129
|
}
|
|
118
130
|
}
|
|
119
131
|
} catch (e) {
|
|
120
|
-
console.log(`⚠️ Could not compare commits in push, falling back to last release
|
|
132
|
+
console.log(`⚠️ Could not compare commits in push (${e.message}), falling back to last release`);
|
|
121
133
|
// Fallback to comparing with last release tag
|
|
122
134
|
if (lastTag) {
|
|
123
135
|
let baseSha;
|
|
@@ -294,6 +306,16 @@ jobs:
|
|
|
294
306
|
echo "Committing version update to main..."
|
|
295
307
|
git config user.name "github-actions[bot]"
|
|
296
308
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
|
309
|
+
|
|
310
|
+
# Ensure we're on main and pull latest changes before pushing
|
|
311
|
+
echo "Fetching latest changes from main..."
|
|
312
|
+
git fetch origin main
|
|
313
|
+
git checkout main
|
|
314
|
+
git pull origin main --rebase || {
|
|
315
|
+
echo "⚠️ Rebase failed, trying merge..."
|
|
316
|
+
git pull origin main --no-rebase
|
|
317
|
+
}
|
|
318
|
+
|
|
297
319
|
git add package.json
|
|
298
320
|
git commit -m "chore: bump version to $RELEASE_VERSION"
|
|
299
321
|
git push origin main
|
package/bun.lock
CHANGED
|
@@ -38,7 +38,6 @@
|
|
|
38
38
|
},
|
|
39
39
|
"overrides": {
|
|
40
40
|
"@solana/codecs-core": "5.1.0",
|
|
41
|
-
"@solana/instruction-plans/@solana/codecs-core": "5.1.0",
|
|
42
41
|
},
|
|
43
42
|
"packages": {
|
|
44
43
|
"@adraffy/ens-normalize": ["@adraffy/ens-normalize@1.11.1", "", {}, "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ=="],
|