Skip to content

Commit

Permalink
Merge branch 'php8' into deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
waldoj authored Jan 25, 2025
2 parents 029c0fb + f578635 commit fde3ecc
Show file tree
Hide file tree
Showing 4 changed files with 335 additions and 470 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/build-php8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build Process for PHP 8

on:
push:
branches:
- php8
pull_request:
branches:
- php8

jobs:
build:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
- name: Install Composer dependencies
run: composer install
- name: Install Node dependencies
run: cd htdocs/js/vendor; yarn install
- run: cd ../../..
- run: find htdocs/*.php -print0 | xargs -0 -n1 -P8 php -l
- name: Set up Docker
uses: docker/setup-buildx-action@v1
- name: Run Docker
run: ./docker-run.sh
- name: Run tests
run: docker exec -i rs_web /var/www/deploy/tests/run-all.sh
- name: Stop Docker
run: ./docker-stop.sh
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"config": {
"vendor-dir": "htdocs/includes/vendor"
"vendor-dir": "htdocs/includes/vendor"
},
"repositories": {
"sphinx-search-api-php-client": {
Expand All @@ -17,12 +17,13 @@
}
},
"require": {
"phpmailer/phpmailer": "~6.5",
"ezyang/htmlpurifier":"~4.9",
"doctrine/instantiator":"1",
"simplepie/simplepie": "1.5.5",
"php": "^8.0",
"phpmailer/phpmailer": "^6.5",
"ezyang/htmlpurifier": "^4.13",
"doctrine/instantiator": "^1.4",
"simplepie/simplepie": "^1.7",
"romainneutron/sphinx-search-api-php-client": "2.0.8.1",
"aws/aws-sdk-php": "~3.186"
"aws/aws-sdk-php": "^3.186"
},
"autoload": {
"classmap": [
Expand Down
Loading

0 comments on commit fde3ecc

Please sign in to comment.