Skip to content

Commit

Permalink
Merge pull request #389 from Automattic/update/ci
Browse files Browse the repository at this point in the history
ci: update workflows
  • Loading branch information
sjinks authored Dec 20, 2024
2 parents d2dd828 + ef5affa commit f6a7de3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 41 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci-grunt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ env:

jobs:
build:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Run Grunt tasks
runs-on: ubuntu-latest
steps:
Expand All @@ -24,7 +23,7 @@ jobs:
uses: actions/[email protected]
with:
node-version: ${{ env.NODE_VERSION }}
caching: true
cache: npm

- name: Install dependencies
run: npm ci --ignore-scripts
Expand Down
24 changes: 3 additions & 21 deletions .github/workflows/ci-php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
test:
name: Run tests
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
fail-fast: false
matrix:
Expand All @@ -39,8 +38,7 @@ jobs:
steps:
- name: Install svn
run: sudo apt-get update && sudo apt-get install -y subversion
shell: bash


- name: Check out source code
uses: actions/[email protected]

Expand All @@ -49,24 +47,8 @@ jobs:
with:
php-version: ${{ matrix.php }}

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

- name: Cache Composer packages
uses: actions/[email protected]
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-${{ matrix.php }}
${{ runner.os }}-php-
- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-interaction --ignore-platform-reqs
- name: Install PHP Dependencies
uses: ramsey/[email protected]

- name: Verify MariaDB connection
run: |
Expand Down
21 changes: 3 additions & 18 deletions .github/workflows/phpcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,17 @@ jobs:
codestyle:
name: Run code style check
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Check out source code
uses: actions/[email protected]

- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.1

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

- name: Cache Composer packages
uses: actions/[email protected]
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-php-7.4-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-php-7.4

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-interaction --ignore-platform-reqs
- name: Install PHP Dependencies
uses: ramsey/[email protected]

- name: Add error matcher
run: echo "::add-matcher::$(pwd)/.github/checkstyle-problem-matcher.json"
Expand Down

0 comments on commit f6a7de3

Please sign in to comment.