From 5a610c170efc565cd28eebf8afeaae236ca685c0 Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 12:31:57 -0500 Subject: [PATCH 01/10] Rename Dokku workflow for clarity. --- .github/workflows/dokku-review-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dokku-review-app.yml b/.github/workflows/dokku-review-app.yml index b64cdc19..10677842 100644 --- a/.github/workflows/dokku-review-app.yml +++ b/.github/workflows/dokku-review-app.yml @@ -1,4 +1,4 @@ -name: Dokku Deploy Review App +name: 'Dokku Review App' on: workflow_dispatch: From 4d09d07c6fabad659e95ff562b2d9c938fb39a21 Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 12:33:48 -0500 Subject: [PATCH 02/10] Add a "finish workflow" job so that when the deploy app jobs are all skipped, the workflow terminates as a success instead of failure. --- .github/workflows/dokku-review-app.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/dokku-review-app.yml b/.github/workflows/dokku-review-app.yml index 10677842..9ff4a872 100644 --- a/.github/workflows/dokku-review-app.yml +++ b/.github/workflows/dokku-review-app.yml @@ -45,3 +45,11 @@ jobs: secrets: github_pat_token: ${{ secrets.GH_BOT_TOKEN }} server: d1.moderntribe.qa + + complete_workflow: + if: ${{ always() }} + needs: [create_review_app, deploy_review_app, destroy_review_app] + runs-on: ubuntu-latest + steps: + - name: Complete Workflow + run: echo "Dokku Deploy Review App workflow complete." From a3ff0917b54846fae6d1de645b2128e27431b197 Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 12:34:30 -0500 Subject: [PATCH 03/10] Rename code quality workflows to match their purpose. --- .github/workflows/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index beb501e9..d72d6a9c 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -1,4 +1,4 @@ -name: 'Workflows' +name: 'Code Quality Checks' on: workflow_dispatch: From 3e4c3360f1ea41087522a8a6b0385a5323c52207 Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 12:35:01 -0500 Subject: [PATCH 04/10] Rename code quality workflows file to match its name. --- .github/workflows/{workflows.yml => code-quality.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{workflows.yml => code-quality.yml} (100%) diff --git a/.github/workflows/workflows.yml b/.github/workflows/code-quality.yml similarity index 100% rename from .github/workflows/workflows.yml rename to .github/workflows/code-quality.yml From 8a0f9a094db180664a2076255fa77a4dd09ab97e Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 12:41:51 -0500 Subject: [PATCH 05/10] Changelog update. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29ade331..8c6ce0ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). Each changelog entry gets prefixed with the category of the item (Added, Changed, Depreciated, Removed, Fixed, Security). +## [2024.06] +- Changed: Renamed and added a finish job to the Dokku Deploy App workflow so that it doesn't fail when all 3 app jobs are skipped. +- Changed: Renamed the code quality workflow from "Workflow" "Code Quality Checks" and renamed the file accordingly. + ## [2024.05] - Updated: Pattern definition consistency for usage of `Inserter:` - Updated: Post pattern now shows up in the pattern selector when adding a new post. From 2475e5c9900f4d4a6360be49f28d84f25b98365c Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 12:44:34 -0500 Subject: [PATCH 06/10] English is hard. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c6ce0ce..e8a87bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format ## [2024.06] - Changed: Renamed and added a finish job to the Dokku Deploy App workflow so that it doesn't fail when all 3 app jobs are skipped. -- Changed: Renamed the code quality workflow from "Workflow" "Code Quality Checks" and renamed the file accordingly. +- Changed: Renamed the code quality workflow from "Workflow" to "Code Quality Checks" and renamed the file accordingly. ## [2024.05] - Updated: Pattern definition consistency for usage of `Inserter:` From 458433fde58f341c8157d255203e03b884f6bc18 Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 13:01:52 -0500 Subject: [PATCH 07/10] Bump GH & 3rd-party action versions to latest to prevent node warnings. --- .github/workflows/deploy-dev.yml | 4 ++-- .github/workflows/deploy-prod.yml | 4 ++-- .github/workflows/deploy-stage.yml | 4 ++-- .github/workflows/lighthouse-ci.yml | 4 ++-- .github/workflows/linting.yml | 6 +++--- .github/workflows/php-tests.yml | 6 +++--- .github/workflows/phpcs.yml | 6 +++--- .github/workflows/pipeline-dokku.yml | 4 ++-- .github/workflows/static-analysis.yml | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 0661a658..dbfad9bb 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -26,7 +26,7 @@ jobs: # Get Build Repository - name: Check out build branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.BUILD_FOLDER }} ref: ${{github.ref}} @@ -52,7 +52,7 @@ jobs: # Set up node version - name: Set up node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: "${{ env.BUILD_FOLDER }}/.nvmrc" cache: 'npm' diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 9ad3ada3..e1d90d15 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -28,7 +28,7 @@ jobs: # Get Build Repository - name: Check out build branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.BUILD_FOLDER }} ref: ${{github.ref}} @@ -54,7 +54,7 @@ jobs: # Set up node version - name: Set up node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: "${{ env.BUILD_FOLDER }}/.nvmrc" cache: 'npm' diff --git a/.github/workflows/deploy-stage.yml b/.github/workflows/deploy-stage.yml index 63358c18..55444095 100644 --- a/.github/workflows/deploy-stage.yml +++ b/.github/workflows/deploy-stage.yml @@ -29,7 +29,7 @@ jobs: # Get Build Repository - name: Check out build branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ env.BUILD_FOLDER }} ref: ${{github.ref}} @@ -55,7 +55,7 @@ jobs: # Set up node version - name: Set up node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: "${{ env.BUILD_FOLDER }}/.nvmrc" cache: 'npm' diff --git a/.github/workflows/lighthouse-ci.yml b/.github/workflows/lighthouse-ci.yml index 46700c65..24ff1ca9 100644 --- a/.github/workflows/lighthouse-ci.yml +++ b/.github/workflows/lighthouse-ci.yml @@ -5,9 +5,9 @@ jobs: lighthouse: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Audit URLs using Lighthouse - uses: treosh/lighthouse-ci-action@v10 + uses: treosh/lighthouse-ci-action@v11 with: urls: | https://moose-dev.d1.moderntribe.qa/?secret=1 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index f51c1c3a..05918eca 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Detect File Changes - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v3 id: changed-files with: list-files: shell @@ -25,7 +25,7 @@ jobs: - name: Set up node if: steps.changed-files.outputs.linting == 'true' - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: './.nvmrc' cache: 'npm' diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml index 563e0347..45ec97e1 100644 --- a/.github/workflows/php-tests.yml +++ b/.github/workflows/php-tests.yml @@ -24,12 +24,12 @@ jobs: steps: - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ${{ env.build_folder }} - name: Detect File Changes - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v3 id: changed-files with: working-directory: ${{ env.build_folder }} @@ -42,7 +42,7 @@ jobs: - name: Checkout slic if: steps.changed-files.outputs.tests == 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: stellarwp/slic ref: main diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index b0ed2519..3dab2f9b 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Detect File Changes - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v3 id: changed-files with: list-files: shell @@ -32,7 +32,7 @@ jobs: uses: shivammathur/setup-php@v2 with: tools: composer:2 - php-version: '8.0' + php-version: '8.1' - name: Get Composer Cache Directory id: composer-cache diff --git a/.github/workflows/pipeline-dokku.yml b/.github/workflows/pipeline-dokku.yml index a3545d15..c6aa9839 100644 --- a/.github/workflows/pipeline-dokku.yml +++ b/.github/workflows/pipeline-dokku.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cloning repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ inputs.branch }} @@ -61,7 +61,7 @@ jobs: mv .deploy/config/local-config-dokku.php local-config.php - name: Setup node version - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: './.nvmrc' cache: 'npm' diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 77c88c97..70fb059b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -13,12 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Detect File Changes - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v3 id: changed-files with: list-files: shell @@ -33,7 +33,7 @@ jobs: if: steps.changed-files.outputs.phpstan == 'true' uses: shivammathur/setup-php@v2 with: - php-version: '8.0' + php-version: '8.1' extensions: mbstring, intl coverage: none tools: composer:2 @@ -44,7 +44,7 @@ jobs: run: | echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 + - uses: actions/cache@v4 if: steps.changed-files.outputs.phpstan == 'true' with: path: ${{ steps.composer-cache.outputs.dir }} From 27251d8ad094cb97f68662dfeec6b55a82607e0e Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 13:05:49 -0500 Subject: [PATCH 08/10] Break some code to test actions. --- wp-content/themes/core/assets/pcss/layout/default.pcss | 4 ++-- wp-content/themes/core/functions.php | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wp-content/themes/core/assets/pcss/layout/default.pcss b/wp-content/themes/core/assets/pcss/layout/default.pcss index d5063874..949a5df3 100644 --- a/wp-content/themes/core/assets/pcss/layout/default.pcss +++ b/wp-content/themes/core/assets/pcss/layout/default.pcss @@ -47,6 +47,6 @@ */ .has-global-padding > .alignfull:where(.has-global-padding):has(.alignwide), .has-global-padding > .alignfull:where(.has-global-padding):has(.aligngrid) { - padding-right: var(--wp--style--root--padding-right); - padding-left: var(--wp--style--root--padding-left); + padding-right:var(--wp--style--root--padding-right); + padding-left:var(--wp--style--root--padding-left); } diff --git a/wp-content/themes/core/functions.php b/wp-content/themes/core/functions.php index 741ffd3a..ae860fd4 100644 --- a/wp-content/themes/core/functions.php +++ b/wp-content/themes/core/functions.php @@ -3,3 +3,7 @@ /** * Core theme functions */ + +if (1=== 2) { + // this block should cause a warning. +} From e8fb5ce58d84d0ed02bd70050d9620a26bb164ef Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 13:07:38 -0500 Subject: [PATCH 09/10] Revert changes. --- wp-content/themes/core/assets/pcss/layout/default.pcss | 4 ++-- wp-content/themes/core/functions.php | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/wp-content/themes/core/assets/pcss/layout/default.pcss b/wp-content/themes/core/assets/pcss/layout/default.pcss index 949a5df3..d5063874 100644 --- a/wp-content/themes/core/assets/pcss/layout/default.pcss +++ b/wp-content/themes/core/assets/pcss/layout/default.pcss @@ -47,6 +47,6 @@ */ .has-global-padding > .alignfull:where(.has-global-padding):has(.alignwide), .has-global-padding > .alignfull:where(.has-global-padding):has(.aligngrid) { - padding-right:var(--wp--style--root--padding-right); - padding-left:var(--wp--style--root--padding-left); + padding-right: var(--wp--style--root--padding-right); + padding-left: var(--wp--style--root--padding-left); } diff --git a/wp-content/themes/core/functions.php b/wp-content/themes/core/functions.php index ae860fd4..741ffd3a 100644 --- a/wp-content/themes/core/functions.php +++ b/wp-content/themes/core/functions.php @@ -3,7 +3,3 @@ /** * Core theme functions */ - -if (1=== 2) { - // this block should cause a warning. -} From 81e38c22480020faff984e8cd3ca07e3f3e88e7f Mon Sep 17 00:00:00 2001 From: David Paul Ellenwood Date: Fri, 21 Jun 2024 13:16:51 -0500 Subject: [PATCH 10/10] Update CHANGELOG.md. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8a87bea..e1b67b4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. The format ## [2024.06] - Changed: Renamed and added a finish job to the Dokku Deploy App workflow so that it doesn't fail when all 3 app jobs are skipped. - Changed: Renamed the code quality workflow from "Workflow" to "Code Quality Checks" and renamed the file accordingly. +- Updated: Updated GitHub default & 3rd-party action versions to eliminate (node version warnings)[https://github.com/moderntribe/moose/actions/runs/9617664104]. ## [2024.05] - Updated: Pattern definition consistency for usage of `Inserter:`