From ce13ca0de01604d0ce1e35a52a1c584c179c1202 Mon Sep 17 00:00:00 2001 From: melissag-ensemble <120194874+melissag-ensemble@users.noreply.github.com> Date: Thu, 14 May 2026 15:07:10 -0700 Subject: [PATCH 1/3] Auto content update (2026-05-14 22:07:09) --- .../workflows/build-auto-generated-files.yml | 11 +++++ .github/workflows/deploy.yml | 8 ++-- .github/workflows/lint.yml | 36 ++++++++++++++++ .github/workflows/post-lint-comment.yml | 32 ++++++++++++++ .github/workflows/stage.yml | 3 +- .gitignore | 40 +++++++++++------ package.json | 43 ++++++++++--------- 7 files changed, 135 insertions(+), 38 deletions(-) create mode 100644 .github/workflows/build-auto-generated-files.yml create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/post-lint-comment.yml diff --git a/.github/workflows/build-auto-generated-files.yml b/.github/workflows/build-auto-generated-files.yml new file mode 100644 index 0000000..3ee6368 --- /dev/null +++ b/.github/workflows/build-auto-generated-files.yml @@ -0,0 +1,11 @@ +--- +name: Build Auto-Generated Files +on: + workflow_dispatch: + +jobs: + build-contributors: + name: Build Auto-Generated Files + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/build-auto-generated-files-v2.yml@main + secrets: inherit + \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b7799b2..8181bc6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,5 +1,5 @@ --- -name: Deployment +name: Production Deployment on: push: branches: @@ -26,8 +26,10 @@ on: jobs: deployment: name: Deployment - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main + if: github.actor != 'adp-devsite-app[bot]' && github.repository != 'AdobeDocs/dev-docs-template' + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy-v2.yml@main + secrets: inherit with: env: ${{ inputs.env || 'prod' }} baseSha: ${{ inputs.baseSha || '' }} - deployAll: ${{ inputs.deployAll || true }} + deployAll: ${{ inputs.deployAll || false }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..44d6c6b --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,36 @@ +--- +name: Lint +on: + pull_request: + branches: [main] + paths: + - 'src/pages/**' + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Lint + id: lint + continue-on-error: true + run: npx --yes github:AdobeDocs/adp-devsite-utils runLint -v + + - name: Save PR number + if: always() + run: echo "${{ github.event.pull_request.number }}" > pr-number.txt + + - name: Upload linter report + if: always() + uses: actions/upload-artifact@v7 + with: + name: linter-report + path: | + linter-report.txt + pr-number.txt + + - name: Fail if linter found errors + if: steps.lint.outcome == 'failure' + run: exit 1 diff --git a/.github/workflows/post-lint-comment.yml b/.github/workflows/post-lint-comment.yml new file mode 100644 index 0000000..d2c75fd --- /dev/null +++ b/.github/workflows/post-lint-comment.yml @@ -0,0 +1,32 @@ +--- +name: Post Linter Report +on: + workflow_run: + workflows: ["Lint"] + types: + - completed + +permissions: + pull-requests: write + +jobs: + comment: + runs-on: ubuntu-latest + if: github.event.workflow_run.event == 'pull_request' + steps: + - name: Download linter report artifact + uses: actions/download-artifact@v8 + with: + name: linter-report + run-id: ${{ github.event.workflow_run.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Post Linter Report to PR + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ github.repository }} + LINTER_REPORT_PATH: ./linter-report.txt + PR_NUMBER_PATH: ./pr-number.txt + run: | + npm install --no-save github:AdobeDocs/adp-devsite-scripts + node node_modules/adp-devsite-scripts/linter-bot/postLinterReport.js diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index c96a42d..d108f50 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -15,7 +15,8 @@ on: jobs: deployment: name: Deployment - uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main + uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy-v2.yml@main + secrets: inherit with: env: stage baseSha: ${{ inputs.baseSha }} diff --git a/.gitignore b/.gitignore index 12be62a..2a83daa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,28 @@ -# OS and IDE generated files + +# OS and IDE generated files # +############################## .DS_Store .vscode .history .idea .editorconfig -.cursor -.claude/ -# npm +# npm yarn node_modules package-lock.json +yarn-error.log +.pnp.* +.yarn/* + +# keep in repo +!.gitignore +!.yarn.lock +!.yarnrc.yml +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions # gatsby files .env @@ -23,16 +36,15 @@ cypress/screenshots # lerna lerna-debug.log -# static -_site - -# Super-linter outputs -super-linter-output -super-linter.log +# local actions +.actrc +.secrets +local-test.yml -# GitHub Actions leftovers -github_conf +# yalc +.yalc +yalc.lock -# local dev -tmp +#txt +linter-output.txt linter-report.txt diff --git a/package.json b/package.json index 305b29e..09f8ad8 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,32 @@ { - "name": "commerce-testing", + "name": "dev-docs-template", "version": "1.0.0", "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/AdobeDocs/commerce-testing" + "url": "https://github.com/AdobeDocs/dev-docs-template" + }, + "author": { + "name": "Tim Kim", + "url": "https://github.com/timkim" + }, + "engines": { + "node": "^24.11.0" }, "scripts": { - "dev": "npx --yes github:AdobeDocs/adp-devsite-utils dev", - "buildNavigation": "npx --yes github:AdobeDocs/adp-devsite-utils buildNavigation -v", - "buildRedirections": "npx --yes github:AdobeDocs/adp-devsite-utils buildRedirections -v", - "renameFiles": "npx --yes github:AdobeDocs/adp-devsite-utils renameFiles -v", - "normalizeLinks": "npx --yes github:AdobeDocs/adp-devsite-utils normalizeLinks -v", - "buildSiteWideBanner": "npx --yes github:AdobeDocs/adp-devsite-utils buildSiteWideBanner -v", - "buildSiteMetadata": "npx --yes github:AdobeDocs/adp-devsite-utils buildSiteMetadata -v", - "buildContributors": "npx --yes github:AdobeDocs/adp-devsite-utils buildContributors -v", - "lint": "npx --yes github:AdobeDocs/adp-devsite-utils runLint -v", - "lint:errorOnly": "npx --yes github:AdobeDocs/adp-devsite-utils runLint", - "link:externalLinkOnly": "npx --yes github:AdobeDocs/adp-devsite-utils runLint --external-links-only -v", - "link:checkAllLinks": "npx --yes github:AdobeDocs/adp-devsite-utils runLint --internal-links-only --external-links-only -v", - "redirectCheck:stage": "npx --yes github:AdobeDocs/adp-devsite-utils redirectChecker stage --verbose", - "redirectCheck:prod": "npx --yes github:AdobeDocs/adp-devsite-utils redirectChecker prod --verbose", - "lint:md": "npx --yes markdownlint-cli2 'src/pages/**/*.md' '*.md'", - "lint:md:fix": "npx --yes markdownlint-cli2 --fix 'src/pages/**/*.md' '*.md'", - "test": "npx --yes jest", - "test:config": "npx --yes jest tests/config.test.js" + "dev": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils dev", + "buildNavigation": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildNavigation -v", + "buildRedirections": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildRedirections -v", + "renameFiles": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils renameFiles -v", + "normalizeLinks": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils normalizeLinks -v", + "buildSiteWideBanner": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildSiteWideBanner -v", + "buildSiteMetadata": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildSiteMetadata -v", + "buildContributors": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils buildContributorsV2 -v", + "lint": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint -v", + "lint:errorOnly": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint", + "link:externalLinkOnly": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint --external-links-only -v", + "link:checkAllLinks": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint --internal-links-only --external-links-only -v", + "redirectCheck:stage": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker stage --verbose", + "redirectCheck:prod": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker prod --verbose" } } From 6e940089a4adf59b3720523cb62dff00002b6537 Mon Sep 17 00:00:00 2001 From: melissag-ensemble <120194874+melissag-ensemble@users.noreply.github.com> Date: Thu, 14 May 2026 15:23:35 -0700 Subject: [PATCH 2/3] fix: preserve repo-specific fields in package.json --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 09f8ad8..733986d 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,10 @@ { - "name": "dev-docs-template", + "name": "commerce-testing", "version": "1.0.0", "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/AdobeDocs/dev-docs-template" - }, - "author": { - "name": "Tim Kim", - "url": "https://github.com/timkim" - }, - "engines": { - "node": "^24.11.0" + "url": "https://github.com/AdobeDocs/commerce-testing" }, "scripts": { "dev": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils dev", @@ -27,6 +20,13 @@ "link:externalLinkOnly": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint --external-links-only -v", "link:checkAllLinks": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils runLint --internal-links-only --external-links-only -v", "redirectCheck:stage": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker stage --verbose", - "redirectCheck:prod": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker prod --verbose" + "redirectCheck:prod": "npx --yes --prefer-online github:AdobeDocs/adp-devsite-utils redirectChecker prod --verbose", + "lint:md": "npx --yes markdownlint-cli2 'src/pages/**/*.md' '*.md'", + "lint:md:fix": "npx --yes markdownlint-cli2 --fix 'src/pages/**/*.md' '*.md'", + "test": "npx --yes jest", + "test:config": "npx --yes jest tests/config.test.js" + }, + "engines": { + "node": "^24.11.0" } } From 92c4f166a0ea590cc4e117c6ec2597eab72d6aa9 Mon Sep 17 00:00:00 2001 From: melissag-ensemble <120194874+melissag-ensemble@users.noreply.github.com> Date: Thu, 14 May 2026 15:23:38 -0700 Subject: [PATCH 3/3] fix: preserve repo-specific fields in .gitignore --- .gitignore | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 2a83daa..ea0c7aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,17 @@ +# .gitignore -# OS and IDE generated files # -############################## +# OS and IDE generated files .DS_Store .vscode .history .idea .editorconfig +.cursor +.claude/ -# npm yarn +# npm node_modules package-lock.json -yarn-error.log -.pnp.* -.yarn/* - -# keep in repo -!.gitignore -!.yarn.lock -!.yarnrc.yml -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions # gatsby files .env @@ -36,15 +25,35 @@ cypress/screenshots # lerna lerna-debug.log -# local actions +# static +_site + +# Super-linter outputs +super-linter-output +super-linter.log + +# GitHub Actions leftovers +github_conf + +# local dev +tmp +linter-report.txt + +# Added by update-bot +yarn-error.log +.pnp.* +.yarn/* +!.gitignore +!.yarn.lock +!.yarnrc.yml +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions .actrc .secrets local-test.yml - -# yalc .yalc yalc.lock - -#txt linter-output.txt -linter-report.txt