From 0eaaa6f119d03f51eda82b165be15aaca1a88951 Mon Sep 17 00:00:00 2001 From: Sean Fisher Date: Tue, 21 Feb 2023 10:54:29 -0500 Subject: [PATCH 1/2] Moving to shared workflow, updating set-output --- .github/dependabot.yml | 15 +++++ .github/workflows/dependabot-auto-approve.yml | 11 ++++ .github/workflows/dependabot-auto-merge.yml | 10 ++++ .github/workflows/linting.yml | 55 +++---------------- .github/workflows/phpunit.yml | 4 +- composer.json | 2 +- 6 files changed, 47 insertions(+), 50 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/dependabot-auto-approve.yml create mode 100644 .github/workflows/dependabot-auto-merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..f33f034 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + + - package-ecosystem: "composer" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/dependabot-auto-approve.yml b/.github/workflows/dependabot-auto-approve.yml new file mode 100644 index 0000000..e2119de --- /dev/null +++ b/.github/workflows/dependabot-auto-approve.yml @@ -0,0 +1,11 @@ +name: dependabot-auto-approve +on: + pull_request: + +permissions: + pull-requests: write + contents: write + +jobs: + dependabot: + uses: alleyinteractive/.github/.github/workflows/dependabot-auto-approve.yml@main diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 0000000..aaed13d --- /dev/null +++ b/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,10 @@ +name: dependabot-auto-merge +on: pull_request_target + +permissions: + pull-requests: write + contents: write + +jobs: + dependabot: + uses: alleyinteractive/.github/.github/workflows/dependabot-auto-merge.yml@main diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index bc382ad..2176f22 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,53 +1,14 @@ -name: Linting +name: Coding Standards on: + push: + branches: + - develop + - main pull_request: + schedule: + - cron: '0 0 * * *' jobs: coding-standards: - runs-on: ubuntu-latest - strategy: - fail-fast: true - - name: Coding Standards - steps: - - name: Cancel previous runs of this workflow (pull requests only) - if: ${{ github.event_name == 'pull_request' }} - uses: styfle/cancel-workflow-action@0.5.0 - with: - access_token: ${{ github.token }} - - - name: Checkout code - uses: actions/checkout@v2 - - - name: Get Composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Set up Composer caching - uses: actions/cache@v2 - env: - cache-name: cache-composer-dependencies - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.0' - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd - tools: composer:v2 - coverage: none - - - name: Install composer dependencies - uses: nick-invision/retry@v1 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer install - - - name: Coding standards - run: composer phpcs + uses: alleyinteractive/.github/.github/workflows/php-coding-standards.yml@main diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index cccf426..209e703 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -37,7 +37,7 @@ jobs: - name: Get Composer cache directory id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Set up Composer caching uses: actions/cache@v2 @@ -73,7 +73,7 @@ jobs: - name: Install WordPress and Copy Project shell: bash run: | - bash <(curl -s "https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh") wordpress_test root '' 127.0.0.1 latest + bash <(curl -s "https://raw.githubusercontent.com/wp-cli/sample-plugin/HEAD/bin/install-wp-tests.sh") wordpress_test root '' 127.0.0.1 latest rm -rf "${WP_CORE_DIR}wp-content/plugins" mkdir -p "${WP_CORE_DIR}wp-content/plugins/wp-component-library" rsync -a --exclude=.git . "${WP_CORE_DIR}wp-content/plugins/wp-component-library" diff --git a/composer.json b/composer.json index 9a6997f..8f4cdb7 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "authors": [ { "name": "Alley Interactive", - "email": "noreply@alleyinteractive.com" + "email": "info@alley.com" } ], "autoload": { From 9ce73a2000273715214135d639d88d75ab92cc96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 15:54:59 +0000 Subject: [PATCH 2/2] Bump scrivo/highlight.php from 9.18.1.9 to 9.18.1.10 Bumps [scrivo/highlight.php](https://github.com/scrivo/highlight.php) from 9.18.1.9 to 9.18.1.10. - [Release notes](https://github.com/scrivo/highlight.php/releases) - [Commits](https://github.com/scrivo/highlight.php/compare/v9.18.1.9...v9.18.1.10) --- updated-dependencies: - dependency-name: scrivo/highlight.php dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index bedb1ee..5018b8a 100644 --- a/composer.lock +++ b/composer.lock @@ -1787,16 +1787,16 @@ }, { "name": "scrivo/highlight.php", - "version": "v9.18.1.9", + "version": "v9.18.1.10", "source": { "type": "git", "url": "https://github.com/scrivo/highlight.php.git", - "reference": "d45585504777e6194a91dffc7270ca39833787f8" + "reference": "850f4b44697a2552e892ffe71490ba2733c2fc6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/d45585504777e6194a91dffc7270ca39833787f8", - "reference": "d45585504777e6194a91dffc7270ca39833787f8", + "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/850f4b44697a2552e892ffe71490ba2733c2fc6e", + "reference": "850f4b44697a2552e892ffe71490ba2733c2fc6e", "shasum": "" }, "require": { @@ -1806,8 +1806,8 @@ "require-dev": { "phpunit/phpunit": "^4.8|^5.7", "sabberworm/php-css-parser": "^8.3", - "symfony/finder": "^2.8|^3.4", - "symfony/var-dumper": "^2.8|^3.4" + "symfony/finder": "^2.8|^3.4|^5.4", + "symfony/var-dumper": "^2.8|^3.4|^5.4" }, "suggest": { "ext-mbstring": "Allows highlighting code with unicode characters and supports language with unicode keywords" @@ -1861,7 +1861,7 @@ "type": "github" } ], - "time": "2021-12-03T06:45:28+00:00" + "time": "2022-12-17T21:53:22+00:00" }, { "name": "symfony/deprecation-contracts",