Skip to content

Commit

Permalink
Update CI configuration, dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
paragonie-security committed Apr 19, 2024
1 parent 6d3ea97 commit 5c8036a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 12 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
phpunit-versions: ['7.5.20']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -37,11 +37,11 @@ jobs:
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
phpunit-versions: ['latest']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -58,11 +58,3 @@ jobs:
uses: php-actions/phpunit@v2
with:
memory_limit: 256M

- name: Install Psalm
if: contains(['7.4', '8.0], ${{ matrix.php-version }})
run: composer require --dev vimeo/psalm:^4

- name: Static Analysis
if: contains(['7.4', '8.0], ${{ matrix.php-version }})
run: composer static-analysis
34 changes: 34 additions & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Psalm

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
psalm:
name: Psalm on PHP ${{ matrix.php-versions }}
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: ['ubuntu-latest']
php-versions: ['8.3']
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
tools: psalm:4
coverage: none

- name: Install Composer dependencies
uses: "ramsey/composer-install@v1"
with:
composer-options: --no-dev

- name: Static Analysis
run: psalm
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"ext-json": "*",
"ext-openssl": "*",
"paragonie/constant_time_encoding": "^1.0.4|^2",
"paragonie/sodium_compat": ">= 1.17 <2"
"paragonie/sodium_compat": "^1|^2"
},
"require-dev": {
"phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
Expand Down

0 comments on commit 5c8036a

Please sign in to comment.