Skip to content

Commit

Permalink
Merge pull request #110 from 10up/chore/several-updates
Browse files Browse the repository at this point in the history
Update versions of GitHub Actions, composer, and node packages
  • Loading branch information
felipeelia authored Dec 9, 2024
2 parents 98cd304 + 541b98a commit c19d5be
Show file tree
Hide file tree
Showing 14 changed files with 15,793 additions and 16,342 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-and-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
coverage: none

- name: install node v18
uses: actions/setup-node@v3
- name: install node v20
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Build
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-with-vendor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
coverage: none

- name: install node v18
uses: actions/setup-node@v3
- name: install node v20
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Build
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linting
env:
COMPOSER_VERSION: "2"
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
NODE_VERSION: "18"
NODE_VERSION: "20"
NODE_CACHE: "${{ github.workspace }}/node_modules_cache"

on:
Expand All @@ -22,20 +22,20 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set standard 10up cache directories
run: |
sudo npm config set cache "${{ env.NODE_CACHE }}" --global
- name: Prepare npm cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.NODE_CACHE }}
key: npm-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
npm-${{ env.NODE_VERSION }}-
- name: "install node v${{ env.NODE_VERSION }}"
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}

Expand All @@ -51,13 +51,13 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set standard 10up cache directories
run: |
composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
- name: Prepare composer cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE }}
key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Test
env:
COMPOSER_VERSION: "2"
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
NODE_VERSION: "18"
NODE_CACHE: "${{ github.workspace }}/node_modules_cache"

on:
schedule:
Expand All @@ -24,7 +22,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Start MySQL
run: sudo systemctl start mysql.service
Expand All @@ -39,14 +37,14 @@ jobs:
- name: Setup Elasticsearch
uses: getong/elasticsearch-action@v1.2
with:
elasticsearch version: '7.10.1'
elasticsearch version: '8.12.2'

- name: Set standard 10up cache directories
run: |
composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
- name: Prepare composer cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.COMPOSER_CACHE }}
key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wordpress-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: WordPress version checker
uses: skaut/wordpress-version-checker@v1.2.0
uses: skaut/wordpress-version-checker@v2.2.2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
7 changes: 2 additions & 5 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
"*.css": [
"10up-toolkit lint-style"
],
"*.js": [
"10up-toolkit lint-js"
],
"*.jsx": [
"*.{js,jsx}": [
"10up-toolkit lint-js"
],
"*.php": [
"./vendor/bin/phpcs --extensions=php --warning-severity=8 -s"
"./vendor/bin/phpcs --extensions=php --runtime-set testVersion 7.4- -s"
]
}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
1 change: 0 additions & 1 deletion .stylelintignore

This file was deleted.

2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "@10up/stylelint-config"
"extends": [ "@10up/stylelint-config" ]
}
Loading

0 comments on commit c19d5be

Please sign in to comment.