Skip to content

Commit 9c26270

Browse files
committed
Fix merge conflicts
2 parents 8aa7010 + ecf9834 commit 9c26270

File tree

137 files changed

+122028
-93246
lines changed

Some content is hidden

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

137 files changed

+122028
-93246
lines changed

.github/pull_request_template.md

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,52 @@
1-
## Describe the Change
1+
# ✅ Pull Request Checklist
22

3-
<!-- Add a description of what the pull request is changing, adding, and any other relevant context. -->
3+
Before submitting your PR for review, please complete this checklist to ensure quality.
44

5-
This PR ....
5+
## Checklist
66

7-
## Changed Pages
7+
- [ ] The **PR description** in the [Describe the Change](#-describe-the-change) section explains what changed and
8+
provides any additional context.
9+
- [ ] A **Jira ticket** is provided in the [Jira Tickets](#-jira-tickets) section AND in the PR title. _If this PR has
10+
no corresponding Jira ticket, then please indicate so in this section._
11+
- [ ] **Preview links** are for all affected pages are provided in the [Changed Pages](#-changed-pages). _If this PR
12+
makes no user-facing changes, please indicate so in this section._
13+
- [ ] Conduct a **self-review** for your pages using your preview links. Verify grammar, clarity, and accuracy.
14+
- [ ] **Check formatting** for your pages
15+
- [ ] Verify indentations, admonitions, and tables (if applicable).
16+
- [ ] Verify all images display.
17+
- [ ] Ensure all **Vale comments** are resolved.
18+
- [ ] If required, raise a PR to modify the
19+
[Vale accept list](https://github.com/spectrocloud/spectro-vale-pkg/blob/main/packages/spectrocloud-docs-internal/styles/config/vocabularies/spectrocloud-vocab/accept.txt).
20+
_This can be done later, but leave a note if required._
21+
- [ ] All **CI jobs** have completed successfully.
22+
- [ ] Add **Backport labels** if the change should be reflected in previous versions. _If required, remember to add the
23+
`auto-backport` label, as well as the `backport-version-**` labels._
24+
- [ ] **Outside review:** Does this PR require review outside of Docs? If yes, tag the appropriate reviewer (for
25+
example, Engineering, Product, etc.)
26+
- [ ] Add the `notify-slack` label once this checklist has been completed. The team will be notified and review your PR.
827

9-
<!-- Add a link to the preview URL generated by Netlify. Include direct links to the pages affected by the PR. -->
28+
Good job! 👏👏👏
29+
30+
---
31+
32+
## 📝 Describe the Change
1033

11-
💻 [Add Preview URL for Page]()
34+
<!-- Add a description of what the pull request is changing, adding, and any other relevant context. -->
1235

13-
## Jira Tickets
36+
This PR ...
1437

15-
<!-- Add a link to the JIRA tickets (if applicable) -->
38+
---
39+
40+
## 💻 Changed Pages
41+
42+
<!-- Add a link to the preview URL generated by Netlify. Include direct links to the pages affected by the PR. -->
1643

17-
🎫 [Jira Ticket]()
44+
- [Add Preview URL for Page]()
1845

19-
## Backports
46+
---
2047

21-
<!-- Add the relevant backport labels to reflect which versions of the docs your changes will affect. -->
48+
## 🎫 Jira Tickets
2249

23-
Can this PR be backported?
50+
<!-- Add a link to the JIRA tickets (if applicable). -->
2451

25-
- [ ] Yes. _Remember to add the relevant backport labels to your PR._
26-
- [ ] No. _Please leave a short comment below about why this PR cannot be backported._
52+
[Jira Ticket]()

.github/workflows/aloglia_crawler.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
2727
steps:
2828
- name: Checkout repo
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030

3131
# - name: Run scraper
3232
# env:

.github/workflows/api_format.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151

5252

5353
- name: Checkout Code
54-
uses: actions/checkout@v5
54+
uses: actions/checkout@v6
5555
with:
5656
token: ${{ steps.import-secrets.outputs.VAULT_GITHUB_TOKEN }}
5757
ref: ${{ github.head_ref }}
5858

5959
- name: Setup Node.js environment
6060
uses: actions/setup-node@v6
6161
with:
62-
node-version: "20"
62+
node-version: "22"
6363
cache: "npm"
6464

6565
- name: Determine branch name
@@ -78,7 +78,7 @@ jobs:
7878

7979

8080
- name: Commit Changes
81-
uses: stefanzweifel/git-auto-commit-action@v6
81+
uses: stefanzweifel/git-auto-commit-action@v7
8282
with:
8383
commit_message: "ci: auto-formatting API changes"
8484
file_pattern: '*.json **.json **/*.json'

.github/workflows/backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
7272
7373
- name: Backport Action
74-
uses: sqren/backport-github-action@v9.5.1
74+
uses: sqren/backport-github-action@v10.2.0
7575
with:
7676
# We are using a PAT token through our Vault Operator to address the issue of PR workflows not being triggered.
7777
# Refer to issue https://github.com/sqren/backport-github-action/issues/79 for more details.

.github/workflows/clean-up-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626

2727
- name: Checkout GitHub Pages Branch
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Remove Branch From Netlify
3131
run: cd scripts && ./netlify_remove_branch.sh
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- name: Checkout GitHub Pages Branch
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
with:
4040
ref: gh-pages
4141

.github/workflows/clean-up-unused-images.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,20 @@ jobs:
3737

3838
- id: checkout
3939
name: Checkout Repository
40-
uses: actions/checkout@v5
40+
uses: actions/checkout@v6
4141
with:
4242
token: ${{ steps.import-secrets.outputs.VAULT_GITHUB_TOKEN }}
4343

4444
- name: Setup Nodejs
4545
uses: actions/setup-node@v6
4646
with:
47-
node-version: "20"
47+
node-version: "22"
4848

4949
- run: npm ci
5050

51+
- name: Generate partials
52+
run: make generate-partials
53+
5154
- name: Find unused images
5255
run: make find-unused-images
5356

.github/workflows/cluster-scanner-librarium.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Palette Samples Repository
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121
with:
2222
repository: spectrocloud/palette-samples
2323

.github/workflows/dependabot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' }}
3838
steps:
3939
- name: Checkout Repository
40-
uses: actions/checkout@v5
40+
uses: actions/checkout@v6
4141

4242
- name: Setup Node.js environment
4343
uses: actions/setup-node@v6
4444
with:
45-
node-version: "20"
45+
node-version: "22"
4646
cache: "npm"
4747

4848
- run: npm ci

.github/workflows/eslint-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
if: ${{ !github.event.pull_request.draft }}
3535
steps:
3636
- name: Checkout Repository
37-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
3838

3939
- name: Setup Node.js environment
4040
uses: actions/setup-node@v6
4141
with:
42-
node-version: "20"
42+
node-version: "22"
4343
cache: "npm"
4444

4545
- run: npm ci

.github/workflows/gitleaks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout current branch
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
with:
3232
ref: ${{ github.event.inputs.branch || github.ref_name }}
3333

0 commit comments

Comments
 (0)