Skip to content

Commit

Permalink
Merge branch 'release/4.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ravorona committed Apr 7, 2024
2 parents 467e027 + 68f42f9 commit c84003a
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 55 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/.gitattributes export-ignore
/.github export-ignore
104 changes: 52 additions & 52 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
name: Development

on:
push:
branches: [develop]
push:
branches: [ develop ]

jobs:
sage:
name: Sage (PHP ${{ matrix.php-versions }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: ["8.1"]
steps:
- name: Checkout
uses: actions/checkout@v2
sage:
name: Sage (PHP ${{ matrix.php-versions }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: [ "8.1" ]
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-
- name: Cache composer dependencies
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader
- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: PHP Review
run: composer lint
- name: PHP Review
run: composer lint

assets:
name: Assets (Node ${{ matrix.node-versions }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-versions: ["14", "16"]
steps:
- name: Checkout
uses: actions/checkout@v2
assets:
name: Assets (Node ${{ matrix.node-versions }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node-versions: [ "18", "20" ]
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.OS }}-nodemodules-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.OS }}-nodemodules
- name: Cache node modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.OS }}-nodemodules-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.OS }}-nodemodules

- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-versions }}
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-versions }}

- name: Install dependencies
run: yarn
- name: Install dependencies
run: yarn

- name: Assets review
run: yarn lint
- name: Assets review
run: yarn lint
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## [4.3.1](https://github.com/ravorona/sage/compare/4.2.0...4.3.1) (2024-04-07)


### Features

* Dependencies update ([137f3f9](https://github.com/ravorona/sage/commit/137f3f9d92c90a9e04a864f336282af6b98df1fc))
* Sage 10.8.2 ([2ad4ca4](https://github.com/ravorona/sage/commit/2ad4ca4cb55d116905ab763469fd69f10c1bf434))
* Set gitattributes ([832506d](https://github.com/ravorona/sage/commit/832506d7b066745d50a2a20d1a7e39c3b8c6f711))
* Update eslint and linter rules ([664509d](https://github.com/ravorona/sage/commit/664509dbb3ccce34797e7dfad7f5d5ea32861ad0))

## [4.3.0](https://github.com/ravorona/sage/compare/4.2.0...4.3.0) (2024-04-07)


Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ravorona/sage",
"version": "4.2.1",
"version": "4.3.1",
"description": "Wordpress theme based on Sage starter theme using Vite",
"license": "MIT",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ravorona/sage",
"version": "4.3.0",
"version": "4.3.1",
"description": "Wordpress theme based on Sage starter theme using Vite",
"license": "MIT",
"type": "module",
Expand Down

0 comments on commit c84003a

Please sign in to comment.