Skip to content

Commit 5f9e6c1

Browse files
committed
Merge branch 'main' into missed-schedules-optimization
2 parents 927306d + f6a7de3 commit 5f9e6c1

File tree

3 files changed

+7
-41
lines changed

3 files changed

+7
-41
lines changed

.github/workflows/ci-grunt.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ env:
1313

1414
jobs:
1515
build:
16-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1716
name: Run Grunt tasks
1817
runs-on: ubuntu-latest
1918
steps:
@@ -24,7 +23,7 @@ jobs:
2423
uses: actions/[email protected]
2524
with:
2625
node-version: ${{ env.NODE_VERSION }}
27-
caching: true
26+
cache: npm
2827

2928
- name: Install dependencies
3029
run: npm ci --ignore-scripts

.github/workflows/ci-php.yaml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
test:
1313
name: Run tests
1414
runs-on: ubuntu-latest
15-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1615
strategy:
1716
fail-fast: false
1817
matrix:
@@ -39,8 +38,7 @@ jobs:
3938
steps:
4039
- name: Install svn
4140
run: sudo apt-get update && sudo apt-get install -y subversion
42-
shell: bash
43-
41+
4442
- name: Check out source code
4543
uses: actions/[email protected]
4644

@@ -49,24 +47,8 @@ jobs:
4947
with:
5048
php-version: ${{ matrix.php }}
5149

52-
- name: Get composer cache directory
53-
id: composer-cache
54-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
55-
56-
- name: Cache Composer packages
57-
uses: actions/[email protected]
58-
with:
59-
path: ${{ steps.composer-cache.outputs.dir }}
60-
key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
61-
restore-keys: |
62-
${{ runner.os }}-php-${{ matrix.php }}
63-
${{ runner.os }}-php-
64-
65-
- name: Validate composer.json and composer.lock
66-
run: composer validate
67-
68-
- name: Install dependencies
69-
run: composer install --prefer-dist --no-progress --no-interaction --ignore-platform-reqs
50+
- name: Install PHP Dependencies
51+
uses: ramsey/[email protected]
7052

7153
- name: Verify MariaDB connection
7254
run: |

.github/workflows/phpcs.yaml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,17 @@ jobs:
1212
codestyle:
1313
name: Run code style check
1414
runs-on: ubuntu-latest
15-
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1615
steps:
1716
- name: Check out source code
1817
uses: actions/[email protected]
1918

2019
- name: Set up PHP
2120
uses: shivammathur/setup-php@v2
2221
with:
23-
php-version: 7.4
22+
php-version: 8.1
2423

25-
- name: Get composer cache directory
26-
id: composer-cache
27-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
28-
29-
- name: Cache Composer packages
30-
uses: actions/[email protected]
31-
with:
32-
path: ${{ steps.composer-cache.outputs.dir }}
33-
key: ${{ runner.os }}-php-7.4-${{ hashFiles('**/composer.lock') }}
34-
restore-keys: ${{ runner.os }}-php-7.4
35-
36-
- name: Validate composer.json and composer.lock
37-
run: composer validate
38-
39-
- name: Install dependencies
40-
run: composer install --prefer-dist --no-progress --no-interaction --ignore-platform-reqs
24+
- name: Install PHP Dependencies
25+
uses: ramsey/[email protected]
4126

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

0 commit comments

Comments
 (0)