Skip to content

Commit 5564af8

Browse files
committed
fix: updated comment and testing workflow
1 parent 0d7f8df commit 5564af8

2 files changed

Lines changed: 20 additions & 12 deletions

File tree

.github/workflows/back-merge-pr.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Opens a PR from master → development after changes land on master (back-merge).
1+
# Opens a PR from fix/DX-6188-test → development after changes land on fix/DX-6188-test (back-merge).
22
#
33
# Org/repo Settings → Actions → General → Workflow permissions: read and write
44
# (so GITHUB_TOKEN can create pull requests). Or use a PAT in secret GH_TOKEN.
55

6-
name: Back-merge master to development
6+
name: Back-merge fix/DX-6188-test to development
77

88
on:
99
push:
10-
branches: [master]
10+
branches: [fix/DX-6188-test]
1111
workflow_dispatch:
1212

1313
permissions:
@@ -28,32 +28,32 @@ jobs:
2828
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929
run: |
3030
set -euo pipefail
31-
git fetch origin development master
31+
git fetch origin development fix/DX-6188-test
3232
33-
MASTER_SHA=$(git rev-parse origin/master)
33+
MASTER_SHA=$(git rev-parse origin/fix/DX-6188-test)
3434
DEV_SHA=$(git rev-parse origin/development)
3535
3636
if [ "$MASTER_SHA" = "$DEV_SHA" ]; then
37-
echo "master and development are at the same commit; nothing to back-merge."
37+
echo "fix/DX-6188-test and development are at the same commit; nothing to back-merge."
3838
exit 0
3939
fi
4040
4141
EXISTING=$(gh pr list --repo "${{ github.repository }}" \
4242
--base development \
43-
--head master \
43+
--head fix/DX-6188-test \
4444
--state open \
4545
--json number \
4646
--jq 'length')
4747
4848
if [ "$EXISTING" -gt 0 ]; then
49-
echo "An open PR from master to development already exists; skipping."
49+
echo "An open PR from fix/DX-6188-test to development already exists; skipping."
5050
exit 0
5151
fi
5252
5353
gh pr create --repo "${{ github.repository }}" \
5454
--base development \
55-
--head master \
56-
--title "chore: back-merge master into development" \
57-
--body "Automated back-merge after changes landed on \`master\`. Review and merge to keep \`development\` in sync."
55+
--head fix/DX-6188-test \
56+
--title "chore: back-merge fix/DX-6188-test into development" \
57+
--body "Automated back-merge after changes landed on \`fix/DX-6188-test\`. Review and merge to keep \`development\` in sync."
5858
59-
echo "Created back-merge PR master → development."
59+
echo "Created back-merge PR fix/DX-6188-test → development."

lib/contentstack_utils/utils.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
require_relative './support/helper.rb'
44
require 'nokogiri'
55

6+
/*
7+
render_content is a method that renders the content of an entry.
8+
It takes two parameters:
9+
- content: the content of the entry
10+
- options: the options for the rendering
11+
12+
It returns a string of the rendered content.
13+
*/
614
module ContentstackUtils
715
def self.render_content(content, options)
816
if (content.instance_of? Array)

0 commit comments

Comments
 (0)