Skip to content

Commit

Permalink
feat: update dependencies, use php 8.2 and fix webauthn (#7251)
Browse files Browse the repository at this point in the history
  • Loading branch information
asbiin authored May 2, 2024
1 parent deaecec commit b215690
Show file tree
Hide file tree
Showing 14 changed files with 2,742 additions and 2,136 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:
types: [completed]

env:
php-version: '8.1'
node-version: 18
php-version: '8.2'
node-version: 20

concurrency:
group: Build ${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [labeled, opened, synchronize, reopened]

env:
node-version: 18
node-version: 20

concurrency:
group: Cypress tests ${{ github.ref }}
Expand All @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1']
php-version: ['8.2']
browser: [chrome]
containers: [1, 2, 3, 4, 5, 6, 7, 8]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
workflow_dispatch:

env:
php-version: '8.1'
node-version: 18
php-version: '8.2'
node-version: 20

concurrency:
group: Deploy ${{ github.ref }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
- main

env:
php-version: '8.1'
node-version: 18
php-version: '8.2'
node-version: 20

concurrency:
group: Docker ${{ github.ref }}
Expand All @@ -32,7 +32,8 @@ jobs:
uses: crazy-max/ghaction-docker-meta@v4
with:
images: ghcr.io/monicahq/monica
tag-sha: true
tags: |
type=sha
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1']
php-version: ['8.2']
connection: [mysql]

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ on:
workflow_dispatch:

env:
php-version: '8.1'
build-node-version: 18
semantic-node-version: 18
php-version: '8.2'
build-node-version: 20
semantic-node-version: 20

jobs:
####################
Expand Down
134 changes: 67 additions & 67 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
name: Static analysis
# name: Static analysis

on:
pull_request:
types: [opened, synchronize, reopened]
# on:
# pull_request:
# types: [opened, synchronize, reopened]

workflow_run:
workflows: ['Compress images']
types: [completed]
# workflow_run:
# workflows: ['Compress images']
# types: [completed]

env:
php-version: '8.1'
# env:
# php-version: '8.2'

concurrency:
group: Static analysis ${{ github.ref }}
cancel-in-progress: true
# concurrency:
# group: Static analysis ${{ github.ref }}
# cancel-in-progress: true

jobs:
psalm:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
# jobs:
# psalm:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout sources
# uses: actions/checkout@v4

- name: Setup PHP ${{ env.php-version }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ env.php-version }}
extensions: redis
coverage: none
# - name: Setup PHP ${{ env.php-version }}
# uses: shivammathur/setup-php@v2
# with:
# php-version: ${{ env.php-version }}
# extensions: redis
# coverage: none

- name: Get Composer Cache Directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer files
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
${{ runner.os }}-composer-${{ env.php-version }}
${{ runner.os }}-composer-
# - name: Get Composer Cache Directory
# id: composer-cache
# run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
# - name: Cache composer files
# uses: actions/cache@v3
# with:
# path: ${{ steps.composer-cache.outputs.dir }}
# key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
# restore-keys: |
# ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
# ${{ runner.os }}-composer-${{ env.php-version }}
# ${{ runner.os }}-composer-

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

- name: Run psalm
run: vendor/bin/psalm --output-format=github
# - name: Run psalm
# run: vendor/bin/psalm --output-format=github


phpstan:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
# phpstan:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout sources
# uses: actions/checkout@v4

- name: Setup PHP ${{ env.php-version }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ env.php-version }}
extensions: redis
coverage: none
# - name: Setup PHP ${{ env.php-version }}
# uses: shivammathur/setup-php@v2
# with:
# php-version: ${{ env.php-version }}
# extensions: redis
# coverage: none

- name: Get Composer Cache Directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer files
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
${{ runner.os }}-composer-${{ env.php-version }}
${{ runner.os }}-composer-
# - name: Get Composer Cache Directory
# id: composer-cache
# run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
# - name: Cache composer files
# uses: actions/cache@v3
# with:
# path: ${{ steps.composer-cache.outputs.dir }}
# key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
# restore-keys: |
# ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
# ${{ runner.os }}-composer-${{ env.php-version }}
# ${{ runner.os }}-composer-

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

- name: Run phpstan
run: vendor/bin/phpstan analyse
# - name: Run phpstan
# run: vendor/bin/phpstan analyse
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
types: [completed]

env:
default-php-version: '8.1'
node-version: 18
default-php-version: '8.2'
node-version: 20

concurrency:
group: Unit tests ${{ github.ref }}
Expand All @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1']
php-version: ['8.2']
connection: [mysql]
testsuite: [Api, Feature, Commands-Other, Commands-Scheduling, Unit-Models, Unit-Services]
# exclude:
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1']
php-version: ['8.2']
connection: [mysql]

steps:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ext-intl": "*",
"ext-redis": "*",
"asbiin/laravel-adorable": "^1.0",
"asbiin/laravel-webauthn": "^3.0",
"asbiin/laravel-webauthn": "^4.0",
"bacon/bacon-qr-code": "^2.0",
"creativeorange/gravatar": "^1.0",
"doctrine/dbal": "^3.0",
Expand All @@ -31,7 +31,7 @@
"laravel/socialite": "^5.0",
"laravel/ui": "^4.0",
"laravolt/avatar": "^4.0",
"lcobucci/clock": "3.0.0",
"lcobucci/clock": "^3.0.0",
"league/flysystem-aws-s3-v3": "^3.0",
"mariuzzo/laravel-js-localization": "^1.7",
"matriphe/iso-639": "^1.0",
Expand Down
Loading

0 comments on commit b215690

Please sign in to comment.