Skip to content

Commit 053576c

Browse files
author
Muhamad Sazwan Bin Ismail
authored
Merge branch 'github:main' into Sazwanismail-patch-1
2 parents 20e50e8 + ba50ad5 commit 053576c

File tree

64 files changed

+1441
-727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1441
-727
lines changed

.github/aw/actions-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"version": "v8",
66
"sha": "ed597411d8f924073f98dfc5c65a23a2325f34cd"
77
},
8-
"github/gh-aw/actions/setup@v0.57.0": {
8+
"github/gh-aw/actions/setup@v0.57.1": {
99
"repo": "github/gh-aw/actions/setup",
10-
"version": "v0.57.0",
11-
"sha": "902845080df391b1f71845fcd7c303dfc0ac90b3"
10+
"version": "v0.57.1",
11+
"sha": "36e5751f7c3d40ec9df8f44c0252b7bfabfc4dd6"
1212
}
1313
}
1414
}

.github/workflows/content-pipelines.yml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
fi
9292
9393
- name: Run content pipeline update script
94-
id: update
9594
env:
9695
GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
9796
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -128,32 +127,31 @@ jobs:
128127
git push origin "$UPDATE_BRANCH"
129128
fi
130129
130+
- name: Read source repo info from config
131+
id: source-info
132+
env:
133+
PIPELINE_ID: ${{ matrix.id }}
134+
run: |
135+
SOURCE_REPO=$(yq -r ".[\"${PIPELINE_ID}\"].\"source-repo\"" src/content-pipelines/config.yml)
136+
SOURCE_PATH=$(yq -r ".[\"${PIPELINE_ID}\"].\"source-path\"" src/content-pipelines/config.yml)
137+
echo "source_repo=$SOURCE_REPO" >> "$GITHUB_OUTPUT"
138+
echo "source_path=$SOURCE_PATH" >> "$GITHUB_OUTPUT"
139+
131140
- name: Create or update PR
132141
if: steps.commit.outputs.has_changes == 'true'
133142
env:
134143
GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
135144
UPDATE_BRANCH: ${{ steps.branch.outputs.update_branch }}
136145
PIPELINE_ID: ${{ matrix.id }}
137-
COMPARE_URL: ${{ steps.update.outputs.compare_url }}
138-
SHORT_RANGE: ${{ steps.update.outputs.short_range }}
146+
SOURCE_REPO: ${{ steps.source-info.outputs.source_repo }}
147+
SOURCE_PATH: ${{ steps.source-info.outputs.source_path }}
139148
run: |
140149
PR_NUMBER="${{ steps.check-pr.outputs.pr_number }}"
141150
PR_TITLE="docs: update ${PIPELINE_ID} content from source docs"
142-
NEW_ITEM="* [\`${SHORT_RANGE}\`](${COMPARE_URL})"
151+
SOURCE_LINK="See the [upstream repo](https://github.com/${SOURCE_REPO}/tree/main/${SOURCE_PATH}) for changes that triggered this update."
143152
144153
if [ -n "$PR_NUMBER" ]; then
145-
echo "PR #$PR_NUMBER already exists — appending source changes to body"
146-
147-
EXISTING_BODY=$(gh pr view "$PR_NUMBER" --json body --jq '.body')
148-
149-
# Append a new bullet before the SOURCE_CHANGES end marker
150-
# Uses bash parameter expansion for safe literal string replacement
151-
MARKER="<!-- /SOURCE_CHANGES -->"
152-
INSERTION="${NEW_ITEM}"$'\n'
153-
INSERTION+="${MARKER}"
154-
UPDATED_BODY="${EXISTING_BODY/$MARKER/$INSERTION}"
155-
156-
gh pr edit "$PR_NUMBER" --body "$UPDATED_BODY"
154+
echo "PR #$PR_NUMBER already exists"
157155
158156
echo "Ensuring PR #$PR_NUMBER is marked ready for review"
159157
gh pr ready "$PR_NUMBER" || echo "Unable to mark PR #$PR_NUMBER as ready (it may already be ready)"
@@ -166,10 +164,7 @@ jobs:
166164
PR_BODY+="## What this does"$'\n\n'
167165
PR_BODY+="Runs the \`content-pipeline-update\` agent (${PIPELINE_ID}) against the latest source docs and updates official articles under \`content/\` that have fallen out of sync."$'\n\n'
168166
PR_BODY+="## Source changes"$'\n\n'
169-
PR_BODY+="Changes in the source repo that triggered this update:"$'\n\n'
170-
PR_BODY+="<!-- SOURCE_CHANGES -->"$'\n'
171-
PR_BODY+="${NEW_ITEM}"$'\n'
172-
PR_BODY+="<!-- /SOURCE_CHANGES -->"$'\n\n'
167+
PR_BODY+="${SOURCE_LINK}"$'\n\n'
173168
PR_BODY+="## Review"$'\n\n'
174169
PR_BODY+="* Review each commit for accuracy — the agent uses AI, so spot-check important changes"$'\n'
175170
PR_BODY+="* To adjust agent behavior, see [Modifying results](${{ github.server_url }}/${{ github.repository }}/blob/main/src/content-pipelines/README.md#modifying-results)"$'\n'
@@ -181,7 +176,7 @@ jobs:
181176
--body "$PR_BODY" \
182177
--base main \
183178
--head "$UPDATE_BRANCH" \
184-
--label "workflow-generated,content-pipeline-update,ready-for-doc-review"
179+
--label "workflow-generated,content-pipeline-update,ready-for-doc-review,skip FR board"
185180
fi
186181
187182
- uses: ./.github/actions/slack-alert

.github/workflows/dependabot-triage-agent.lock.yml

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/dependabot-triage-agent.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ permissions:
1414
timeout-minutes: 90
1515
engine:
1616
id: copilot
17-
model: claude-opus-4.6
1817
env:
1918
COPILOT_GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_COPILOT }}
2019
tools:

.github/workflows/validate-openapi-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232

3333
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
34+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3535

3636
- name: Build Docker image
3737
run: |

content/admin/managing-your-enterprise-account/changing-the-url-for-your-enterprise.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ If your company pays for {% data variables.product.prodname_ghe_cloud %} by cred
1616

1717
> [!NOTE]
1818
> If you pay for {% data variables.product.prodname_ghe_cloud %} via invoice, or if your enterprise uses {% data variables.product.prodname_emus %}, you must contact {% data variables.contact.contact_enterprise_sales %} to change your enterprise slug.
19+
> For enterprises hosted on {% data variables.enterprise.data_residency_site %}, changing the enterprise slug is not currently supported.
1920
2021
## Considerations when changing your enterprise slug
2122

0 commit comments

Comments
 (0)