Skip to content

Commit b5c1441

Browse files
authored
Merge branch 'main' into add-custom-attributes
2 parents de0d466 + d0dca75 commit b5c1441

12 files changed

Lines changed: 90 additions & 51 deletions

File tree

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Build Auto-Generated Files
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
build-contributors:
8+
name: Build Auto-Generated Files
9+
uses: AdobeDocs/adp-devsite-workflow/.github/workflows/build-auto-generated-files-v2.yml@main
10+
secrets: inherit
11+

.github/workflows/build-site-metadata.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/deploy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Deployment
2+
name: Production Deployment
33
on:
44
push:
55
branches:
@@ -26,7 +26,9 @@ on:
2626
jobs:
2727
deployment:
2828
name: Deployment
29-
uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main
29+
if: github.actor != 'adp-devsite-app[bot]' && github.repository != 'AdobeDocs/dev-docs-template'
30+
uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy-v2.yml@main
31+
secrets: inherit
3032
with:
3133
env: ${{ inputs.env || 'prod' }}
3234
baseSha: ${{ inputs.baseSha || '' }}

.github/workflows/lint.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ on:
99
jobs:
1010
lint:
1111
runs-on: ubuntu-latest
12-
permissions:
13-
contents: read
14-
pull-requests: write
1512
steps:
1613
- name: Checkout
17-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1815

1916
- name: Lint
2017
id: lint
2118
continue-on-error: true
2219
run: npx --yes github:AdobeDocs/adp-devsite-utils runLint -v
2320

24-
- name: Post Linter Report to PR
21+
- name: Save PR number
2522
if: always()
26-
env:
27-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
PR_ID: ${{ github.event.pull_request.number }}
29-
GITHUB_REPOSITORY: ${{ github.repository }}
30-
run: |
31-
npm install --no-save github:AdobeDocs/adp-devsite-scripts
32-
node node_modules/adp-devsite-scripts/linter-bot/postLinterReport.js
23+
run: echo "${{ github.event.pull_request.number }}" > pr-number.txt
24+
25+
- name: Upload linter report
26+
if: always()
27+
uses: actions/upload-artifact@v7
28+
with:
29+
name: linter-report
30+
path: |
31+
linter-report.txt
32+
pr-number.txt
3333
3434
- name: Fail if linter found errors
3535
if: steps.lint.outcome == 'failure'
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Post Linter Report
3+
on:
4+
workflow_run:
5+
workflows: ["Lint"]
6+
types:
7+
- completed
8+
9+
permissions:
10+
pull-requests: write
11+
12+
jobs:
13+
comment:
14+
runs-on: ubuntu-latest
15+
if: github.event.workflow_run.event == 'pull_request'
16+
steps:
17+
- name: Download linter report artifact
18+
uses: actions/download-artifact@v8
19+
with:
20+
name: linter-report
21+
run-id: ${{ github.event.workflow_run.id }}
22+
github-token: ${{ secrets.GITHUB_TOKEN }}
23+
24+
- name: Post Linter Report to PR
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
GITHUB_REPOSITORY: ${{ github.repository }}
28+
LINTER_REPORT_PATH: ./linter-report.txt
29+
PR_NUMBER_PATH: ./pr-number.txt
30+
run: |
31+
npm install --no-save github:AdobeDocs/adp-devsite-scripts
32+
node node_modules/adp-devsite-scripts/linter-bot/postLinterReport.js

.github/workflows/stage.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ on:
1515
jobs:
1616
deployment:
1717
name: Deployment
18-
uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main
18+
uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy-v2.yml@main
19+
secrets: inherit
1920
with:
2021
env: stage
21-
baseSha: ${{ inputs.baseSha || '' }}
22-
deployAll: ${{ inputs.deployAll || false }}
22+
baseSha: ${{ inputs.baseSha }}
23+
deployAll: ${{ inputs.deployAll }}

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# OS and IDE generated files #
32
##############################
43
.DS_Store
@@ -47,8 +46,6 @@ local-test.yml
4746
.yalc
4847
yalc.lock
4948

50-
51-
5249
# Linter outputs
5350
super-linter-output
5451
super-linter.log
@@ -59,3 +56,6 @@ github_conf
5956

6057
# Temporary files
6158
tmp/
59+
60+
# Added by update-bot
61+
linter-output.txt

package.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,32 @@
11
{
22
"name": "commerce-php",
3+
"version": "1.0.0",
34
"license": "Apache-2.0",
45
"repository": {
56
"type": "git",
67
"url": "https://github.com/AdobeDocs/commerce-php"
78
},
8-
"config": {
9+
"config": {
910
"sitePath": "commerce/php"
1011
},
12+
"engines": {
13+
"node": "^24.11.0"
14+
},
1115
"scripts": {
12-
"dev": "npx --yes github:AdobeDocs/adp-devsite-utils dev",
13-
"buildNavigation": "npx --yes github:AdobeDocs/adp-devsite-utils buildNavigation -v",
14-
"buildRedirections": "npx --yes github:AdobeDocs/adp-devsite-utils buildRedirections -v",
15-
"renameFiles": "npx --yes github:AdobeDocs/adp-devsite-utils renameFiles -v",
16-
"normalizeLinks": "npx --yes github:AdobeDocs/adp-devsite-utils normalizeLinks -v",
17-
"buildSiteWideBanner": "npx --yes github:AdobeDocs/adp-devsite-utils buildSiteWideBanner -v",
18-
"buildSiteMetadata": "npx --yes github:AdobeDocs/adp-devsite-utils buildSiteMetadata -v",
19-
"buildContributors": "npx --yes github:AdobeDocs/adp-devsite-utils buildContributors -v",
20-
"lint": "npx --yes github:AdobeDocs/adp-devsite-utils runLint -v",
21-
"lint:errorOnly": "npx --yes github:AdobeDocs/adp-devsite-utils runLint",
22-
"link:externalLinkOnly": "npx --yes github:AdobeDocs/adp-devsite-utils runLint --external-links-only -v",
23-
"link:checkAllLinks": "npx --yes github:AdobeDocs/adp-devsite-utils runLint --internal-links-only --external-links-only -v",
24-
"redirectCheck:stage": "npx --yes github:AdobeDocs/adp-devsite-utils redirectChecker stage --verbose",
25-
"redirectCheck:prod": "npx --yes github:AdobeDocs/adp-devsite-utils redirectChecker prod --verbose",
16+
"dev": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils dev",
17+
"buildNavigation": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildNavigation -v",
18+
"buildRedirections": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildRedirections -v",
19+
"renameFiles": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils renameFiles -v",
20+
"normalizeLinks": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils normalizeLinks -v",
21+
"buildSiteWideBanner": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildSiteWideBanner -v",
22+
"buildSiteMetadata": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildSiteMetadata -v",
23+
"buildContributors": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildContributorsV2 -v",
24+
"lint": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint -v",
25+
"lint:errorOnly": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint",
26+
"link:externalLinkOnly": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint --external-links-only -v",
27+
"link:checkAllLinks": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint --internal-links-only --external-links-only -v",
28+
"redirectCheck:stage": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker stage --verbose",
29+
"redirectCheck:prod": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker prod --verbose",
2630
"lint:md": "npx --yes markdownlint-cli2 'src/pages/**/*.md' '*.md'",
2731
"lint:md:fix": "npx --yes markdownlint-cli2 --fix 'src/pages/**/*.md' '*.md'",
2832
"test": "npx --yes jest",

src/pages/development/backward-incompatible-changes/magento-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ To view changes in functional tests, refer to [Backward incompatible changes in
2727

2828
Patch releases are primarily focused on delivering security and quality enhancements on a regular basis to help you keep your sites performing at their peak. On an exceptional basis, breaking changes or additional patches or hotfixes may be released to address security or compliance issues and high-impact quality issues. On the module level, these are mostly PATCH-level changes; sometimes MINOR-level changes. See [Release policy](https://experienceleague.adobe.com/en/docs/commerce-operations/release/planning/versioning-policy).
2929

30-
## 2.4.8 - 2.4.9-beta1
30+
## 2.4.8 - 2.4.9
3131

32-
<Fragment src="/includes/backward-incompatible-changes/open-source/2-4-8-2-4-9-beta1.md"/>
32+
<Fragment src="/includes/backward-incompatible-changes/open-source/2-4-8-to-2-4-9.md"/>
3333

3434
## 2.4.7 - 2.4.8
3535

src/pages/development/backward-incompatible-changes/reference.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ To view changes in functional tests, refer to [Backward incompatible changes in
2727

2828
Patch releases are primarily focused on delivering security and quality enhancements on a regular basis to help you keep your sites performing at their peak. On an exceptional basis, breaking changes or additional patches or hotfixes may be released to address security or compliance issues and high-impact quality issues. On the module level, these are mostly PATCH-level changes; sometimes MINOR-level changes. See [Release policy](https://experienceleague.adobe.com/en/docs/commerce-operations/release/planning/versioning-policy).
2929

30-
## 2.4.8 - 2.4.9-beta1
30+
## 2.4.8 - 2.4.9
3131

32-
Adobe Commerce v2.4.9-beta1 includes the [B2B extension] v1.5.3-beta1.
32+
Adobe Commerce v2.4.9 includes the [B2B extension] v1.5.3.
3333

34-
<Fragment src="/includes/backward-incompatible-changes/commerce/2-4-8-2-4-9-beta1.md"/>
34+
<Fragment src="/includes/backward-incompatible-changes/commerce/2-4-8-to-2-4-9.md"/>
3535

3636
## 2.4.7 - 2.4.8
3737

@@ -63,5 +63,4 @@ Adobe Commerce v2.4.4 includes the [B2B extension] v1.3.3.
6363

6464
<Fragment src="/includes/backward-incompatible-changes/commerce/2-4-3-2-4-4.md"/>
6565

66-
\<!-- Links --\>
6766
[B2B extension]: https://experienceleague.adobe.com/en/docs/commerce-admin/b2b/reference/backward-incompatible-changes "B2B extension"

0 commit comments

Comments
 (0)