Skip to content

Commit 6c18dbb

Browse files
Merge pull request #231 from contentstack/development
DX | 25-05-2026 | Release
2 parents c574c03 + f4ac04a commit 6c18dbb

7 files changed

Lines changed: 493 additions & 244 deletions

File tree

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Back-merge main to development
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
13+
jobs:
14+
open-back-merge-pr:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Open back-merge PR if needed
23+
env:
24+
GH_TOKEN: ${{ github.token }}
25+
run: |
26+
set -euo pipefail
27+
BASE_BRANCH="development"
28+
SOURCE_BRANCH="main"
29+
30+
git fetch origin "$BASE_BRANCH" "$SOURCE_BRANCH"
31+
32+
if ! git show-ref --verify --quiet "refs/remotes/origin/$BASE_BRANCH"; then
33+
echo "Base branch '$BASE_BRANCH' does not exist on origin; skipping."
34+
exit 0
35+
fi
36+
37+
SOURCE_SHA=$(git rev-parse "origin/$SOURCE_BRANCH")
38+
BASE_SHA=$(git rev-parse "origin/$BASE_BRANCH")
39+
40+
if [ "$SOURCE_SHA" = "$BASE_SHA" ]; then
41+
echo "$SOURCE_BRANCH and $BASE_BRANCH are at the same commit; nothing to back-merge."
42+
exit 0
43+
fi
44+
45+
EXISTING=$(gh pr list --repo "${{ github.repository }}" --base "$BASE_BRANCH" --head "$SOURCE_BRANCH" --state open --json number --jq 'length')
46+
47+
if [ "$EXISTING" -gt 0 ]; then
48+
echo "An open PR from $SOURCE_BRANCH to $BASE_BRANCH already exists; skipping."
49+
exit 0
50+
fi
51+
52+
gh pr create --repo "${{ github.repository }}" --base "$BASE_BRANCH" --head "$SOURCE_BRANCH" --title "chore: back-merge $SOURCE_BRANCH into $BASE_BRANCH" --body "Automated back-merge after changes landed on \\`$SOURCE_BRANCH\\`. Review and merge to keep \\`$BASE_BRANCH\\` in sync."
53+
54+
echo "Created back-merge PR $SOURCE_BRANCH -> $BASE_BRANCH."

‎.talismanrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: ed661d0e4275f17c6333c34423127eb76c5c66ea4aa28f16cfea9502d100ddea
3+
checksum: 1cba2ff4ea6e6f725f6d22bc8c2e04e46c30923986124ef7b4689c705a0397f1
44
version: ""

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
## Change log
22

3-
### Version: 1.3.15
3+
### Version: 1.4.0
44
#### Date: May-25-2026
5+
- Fix: Evaluate `retryCondition` for transient network-level errors (e.g. `ETIMEDOUT`, `ECONNRESET`, `EPIPE`) that have no HTTP response, so configured retry policies apply without external axios interceptors
6+
- Fix: Honor `retryDelayOptions.customBackoff` in the delivery SDK retry delay path (network retries, `retryCondition` retries, and 429/401 retries)
57
- Fix: Bump axios to ^1.16.1 and qs to 6.15.2
68

9+
710
### Version: 1.3.14
811
#### Date: May-04-2026
912
- Fix: Bump axios to ^1.15.2 (security patches for axios 1.15.0)

0 commit comments

Comments
 (0)