diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index df8f66c4..d3a32f3d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a Fix # Test URLs: -- Before: https://main--aem-block-collection--adobe.hlx.page -- After: https://--aem-block-collection--adobe.hlx.page +- Before: https://main--{repo}--{owner}.aem.live/ +- After: https://--{repo}--{owner}.aem.live/ \ No newline at end of file diff --git a/.github/workflows/cleanup-on-create.yaml b/.github/workflows/cleanup-on-create.yaml new file mode 100644 index 00000000..0f8d1664 --- /dev/null +++ b/.github/workflows/cleanup-on-create.yaml @@ -0,0 +1,49 @@ +# This workflow will run upon repository creation and clean up +# all files that are not strictly required to build an AEM Live project +# but that we use to develop the project template. This includes this +# particular workflow file. +on: + create: + branches: + - main + workflow_dispatch: +jobs: + cleanup: + runs-on: ubuntu-latest + permissions: + contents: write + actions: write + # only run if commit message is "Initial commit" on main branch + if: ${{ github.event_name == 'workflow_dispatch' || ( github.ref == 'refs/heads/main' && !(contains(github.event, 'head_commit') || github.event.head_commit.message == 'Initial commit' )) }} + steps: + - name: Checkout + uses: actions/checkout@v5 + - name: Use Node.js 20 + uses: actions/setup-node@v6 + with: + node-version: 24 + - name: Remove Helper Files + run: | + rm -rf \ + .github/workflows/cleanup-on-create.yaml \ + CHANGELOG.md + + - name: Initialize README + # replace {repo} and {owner} with the actual values + run: | + sed -i.bak "s/{repo}/$(basename ${{ github.repository }})/g" README.md + sed -i.bak "s/{owner}/$(dirname ${{ github.repository }})/g" README.md + - name: Initialize Pull Request Template + run: | + sed -i.bak "s/{repo}/$(basename ${{ github.repository }})/g" .github/pull_request_template.md + sed -i.bak "s/{owner}/$(dirname ${{ github.repository }})/g" .github/pull_request_template.md + + + # commit back to the repository + - name: Commit changes + run: | + git config --local user.email "helix@adobe.com" + git config --local user.name "AEM Bot" + git add . + git commit -m "chore: cleanup repository template" + git push diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 39a04bf6..f167d347 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,10 +5,10 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Use Node.js 20 - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: - node-version: 20 + node-version: 24 - run: npm ci - run: npm run lint \ No newline at end of file diff --git a/.renovaterc.json b/.renovaterc.json index 231dbf82..8d22d5b3 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -1,3 +1,8 @@ { - "extends": ["config:recommended"] + "extends": ["config:recommended"], + "packageRules": [{ + "matchDepTypes": ["devDependencies"], + "labels": ["ignore-psi-check"], + "automerge": true + }] } diff --git a/404.html b/404.html index f9a02356..37fc0ed0 100644 --- a/404.html +++ b/404.html @@ -9,7 +9,7 @@ - +