From b98fae2ac9a86ba66010b7be10ea94468c96c72d Mon Sep 17 00:00:00 2001 From: Stanislav Zhuk Date: Thu, 8 Oct 2026 10:26:41 +0300 Subject: [PATCH] chore: apply add-on update checker fixes, test on ubuntu-26.04-arm ## Short Summary (TL;DR) Brings the repo in line with the current `ddev-addon-template`, so `ddev utility addon-update-checker` passes, and runs tests on arm64 with `ubuntu-26.04-arm`. ## The Issue `ddev utility addon-update-checker` reported 6 outdated items: the workflow (tmate debug input description, no `os` matrix), the PR template (no TL;DR section, tarball URL instead of `--pr`), `.editorconfig` missing from `.gitattributes`, and a missing `.editorconfig`. ## How This PR Solves The Issue - `.github/workflows/tests.yml`: synced with upstream (renamed debug input, `schedule` indentation), with an `os` matrix of `ubuntu-latest` and `ubuntu-26.04-arm`. The `develop` push branch is kept. `backstopjs/backstopjs:6.3.25` publishes arm64. - `.github/PULL_REQUEST_TEMPLATE.md`: add the TL;DR section, use `ddev add-on get ddev/ddev-backstopjs --pr` - `.gitattributes`: also exclude `.editorconfig` from release tarballs - `.editorconfig`: added from upstream ## Manual Testing Instructions ```bash ddev add-on get ddev/ddev-backstopjs --pr REPLACE_ME_WITH_THIS_PR_NUMBER ddev restart ``` ## Automated Testing Overview No test logic changes. `ddev utility addon-update-checker` passes. `git archive` contains only the add-on files, `LICENSE` and `README.md`. ## Release/Deployment Notes None. Co-Authored-By: Claude Opus 5.5 --- .editorconfig | 15 +++++++++++++++ .gitattributes | 1 + .github/PULL_REQUEST_TEMPLATE.md | 6 +++++- .github/workflows/tests.yml | 7 ++++--- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..27fed85 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.{bats,sh,yml,yaml}] +indent_size = 2 diff --git a/.gitattributes b/.gitattributes index 70215be..c13c93a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ tests/ export-ignore .github/ export-ignore .gitattributes export-ignore +.editorconfig export-ignore diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 62b68b7..0ff0140 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,7 @@ +## Short Summary (TL;DR) + + + ## The Issue - Fixes #REPLACE_ME_WITH_RELATED_ISSUE_NUMBER @@ -13,7 +17,7 @@ ```bash -ddev add-on get https://github.com/ddev/ddev-backstopjs/tarball/refs/pull/REPLACE_ME_WITH_THIS_PR_NUMBER/head +ddev add-on get ddev/ddev-backstopjs --pr REPLACE_ME_WITH_THIS_PR_NUMBER ddev restart ``` diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 90258d6..bf8e8de 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,13 +9,13 @@ on: - "**.md" schedule: - - cron: '25 08 * * *' + - cron: '25 08 * * *' workflow_dispatch: inputs: debug_enabled: type: boolean - description: Debug with tmate + description: Enable remote debugging session required: false default: false @@ -30,10 +30,11 @@ jobs: tests: strategy: matrix: + os: [ubuntu-latest, ubuntu-26.04-arm] ddev_version: [stable, HEAD] fail-fast: false - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} steps: - uses: ddev/github-action-add-on-test@v2