From e85e77a574bb690c64e5ff8e50ed880d6cceac6d Mon Sep 17 00:00:00 2001 From: Patrick Organ Date: Mon, 8 Apr 2024 03:40:20 -0400 Subject: [PATCH 1/5] Delete package-lock.json --- package-lock.json | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 0b303a8..0000000 --- a/package-lock.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "pixelmatch-php", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "dependencies": { - "Pixelmatch": "^5.3.0", - "pngjs": "^7.0.0" - } - }, - "node_modules/Pixelmatch": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/Pixelmatch/-/Pixelmatch-5.3.0.tgz", - "integrity": "sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==", - "dependencies": { - "pngjs": "^6.0.0" - }, - "bin": { - "Pixelmatch": "bin/Pixelmatch" - } - }, - "node_modules/Pixelmatch/node_modules/pngjs": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz", - "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==", - "engines": { - "node": ">=12.13.0" - } - }, - "node_modules/pngjs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-7.0.0.tgz", - "integrity": "sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==", - "engines": { - "node": ">=14.19.0" - } - } - } -} From 7da551f5216d481ad2d5a4a7fd3822db50687b6f Mon Sep 17 00:00:00 2001 From: Patrick Organ Date: Mon, 8 Apr 2024 03:40:29 -0400 Subject: [PATCH 2/5] Delete build directory --- build/report.junit.xml | 113 ----------------------------------------- 1 file changed, 113 deletions(-) delete mode 100644 build/report.junit.xml diff --git a/build/report.junit.xml b/build/report.junit.xml deleted file mode 100644 index 92dacfc..0000000 --- a/build/report.junit.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 94740a68816d7b69f60e6ed06d0a22cb07f60c3c Mon Sep 17 00:00:00 2001 From: Patrick Organ Date: Mon, 8 Apr 2024 03:43:20 -0400 Subject: [PATCH 3/5] use bun instead of node for faster test run time while maintaining compatibility --- .github/workflows/run-tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 32a1120..045cdcc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,11 +17,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - - name: Setup Node - uses: actions/setup-node@v4 + + - uses: oven-sh/setup-bun@v1 with: - node-version: '20' + bun-version: latest - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -36,8 +35,9 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Install dependencies run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction - + + - name: Install dependencies + run: bun install + - name: Execute tests - run: | - npm install - vendor/bin/phpunit + run: vendor/bin/phpunit From 3e361876ab44707f777b45d1cf60337f334e66a0 Mon Sep 17 00:00:00 2001 From: Patrick Organ Date: Mon, 8 Apr 2024 03:44:03 -0400 Subject: [PATCH 4/5] Update dependabot-auto-merge.yml --- .github/workflows/dependabot-auto-merge.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 60183c5..a19d053 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,20 +13,13 @@ jobs: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1.6.0 + uses: dependabot/fetch-metadata@v2.0.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" compat-lookup: true - - name: Auto-merge Dependabot PRs for semver-minor updates - if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}} - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - - name: Auto-merge Dependabot PRs for semver-patch updates - if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}} + - name: Auto-merge Dependabot PRs for semver-minor/patch updates + if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}} run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From a8fa9466e4018408b765775e69f4b69760dd8765 Mon Sep 17 00:00:00 2001 From: Patrick Organ Date: Mon, 8 Apr 2024 03:45:18 -0400 Subject: [PATCH 5/5] add composer updates to dependabot --- .github/dependabot.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a76dd83..c3b6e88 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,8 +1,11 @@ version: 2 updates: - - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" + - package-ecosystem: "composer" + directory: "/" + schedule: + interval: "weekly"