Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
msyk committed Jul 21, 2024
2 parents d663c10 + 9130c71 commit 3ad8585
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 11 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/e2e-test-chrome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
operating-system: [ 'ubuntu-latest' ]
# operating-system: [ubuntu-latest, macos-latest, windows-latest]
php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]
php-versions: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
name: End-to-End Test for Chrome on ${{ matrix.operating-system }} with PHP ${{ matrix.php-versions }}
services:
mysql: # https://qiita.com/sayama0402/items/e863ffb597ce87bf2e2f
Expand Down Expand Up @@ -127,5 +127,3 @@ jobs:
#
# - name: Starting End-to-End Tests about Clinet Synchronization with Google Chrome
# run: cd spec/run;npx wdio wdio-sync-chrome.conf.js


11 changes: 5 additions & 6 deletions .github/workflows/e2e-test-firefox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ jobs:
# continue-on-error: true
strategy:
matrix:
operating-system: [ubuntu-latest]
operating-system: [ 'ubuntu-latest' ]
# operating-system: [ubuntu-latest, macos-latest, windows-latest]
php-versions: ['8.2']
php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
name: End-to-End Test for Firefox on ${{ matrix.operating-system }} with PHP ${{ matrix.php-versions }}
services:
mysql: # https://qiita.com/sayama0402/items/e863ffb597ce87bf2e2f
image: mysql:5.7
image: mysql:8.0
ports:
- 3306:3306
env:
MYSQL_ROOT_PASSWORD: EeLeBui7%Eesa4oto
options: --health-cmd "mysqladmin ping -h localhost" --health-interval 20s --health-timeout 10s --health-retries 10

postgres:
image: postgres:12
image: postgres:16
ports:
- 5432:5432
env:
Expand All @@ -39,7 +39,7 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v4 # v4.1.1
- uses: actions/checkout@v4
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
Expand Down Expand Up @@ -105,4 +105,3 @@ jobs:
- name: Starting End-to-End Tests with Firefox
run: cd spec/run;npx wdio wdio-firefox.conf.js

4 changes: 2 additions & 2 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: [ ubuntu-latest ]
operating-system: [ 'ubuntu-latest' ]
# operating-system: [ubuntu-latest, macos-latest, windows-latest]
php-versions: [ '8.1','8.2','8.3','nightly' ]
php-versions: [ '8.1', '8.2', '8.3', '8.4', 'nightly' ]
name: Unit Test on ${{ matrix.operating-system }} with PHP ${{ matrix.php-versions }}
services:
mysql: # https://qiita.com/sayama0402/items/e863ffb597ce87bf2e2f
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/phpcs-security-audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: phpcs-security-audit

on:
push:
branches:
- "*"
pull_request:
branches: [ 'master', 'main' ]

jobs:
run:
name: phpcs-security-audit
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
with:
php-version: '8.3'

- name: Install phpcs-security-audit
run: |
composer require --dev pheromone/phpcs-security-audit
composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
composer require --dev dealerdirect/phpcodesniffer-composer-installer:"^1.0"
- name: Run phpcs
continue-on-error: true
run: |
./vendor/bin/phpcs --extensions=php,inc,lib,module,info --standard=./vendor/pheromone/phpcs-security-audit/example_base_ruleset.xml --warning-severity=6 src
exit 0

0 comments on commit 3ad8585

Please sign in to comment.