Merge branch 'master' into 23.x

aplus-framework · Dec 22, 2022 · d05757c · d05757c
2 parents 1f12fd8 + 5662ac7
commit d05757c
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,10 +13,8 @@ jobs:
 
     strategy:
       fail-fast: true
-      matrix:
-        php: ['8.1']
 
-    name: PHP ${{ matrix.php }}
+    name: PHP 8.1
 
     steps:
       - name: Checkout
@@ -25,7 +23,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: 8.1
           tools: composer
           coverage: xdebug
 
@@ -47,7 +45,7 @@ jobs:
 
       - name: PHPStan
         run:
-          vendor/bin/phpstan analyse -vvv
+          vendor/bin/phpstan analyse --xdebug -vvv
 
       - name: PHPUnit
         run: vendor/bin/phpunit --verbose
@@ -60,4 +58,30 @@ jobs:
           cp build/coverage/clover.xml build/logs/clover.xml
           composer global require php-coveralls/php-coveralls
           php-coveralls --coverage_clover=build/logs/clover.xml -v
-        if: matrix.php == '8.1'
+
+  tests-last:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+
+    strategy:
+      fail-fast: true
+
+    name: PHP 8.2 - Last
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: composer
+          coverage: xdebug
+
+      - name: Install dependencies
+        run:
+          composer update
+
+      - name: PHPUnit
+        run: vendor/bin/phpunit --verbose
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -14,12 +14,13 @@ test:php:
     paths:
       - vendor/
   before_script:
+    - php -v
     - composer update
   script:
     - composer normalize --dry-run --indent-size=4 --indent-style=space
     - vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
     - vendor/bin/phpmd app xml phpmd.xml
-    - vendor/bin/phpstan analyse -vvv
+    - vendor/bin/phpstan analyse --xdebug -vvv
     - vendor/bin/phpunit --colors=never
     - phpdoc
   artifacts:
@@ -28,6 +29,20 @@ test:php:
       - build/docs/
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
 
+test:php-last:
+  image: registry.gitlab.com/aplus-framework/images/lempa:3
+  stage: test
+  timeout: 30 minutes
+  cache:
+    paths:
+      - vendor/
+  before_script:
+    - php -v
+    - composer update
+  script:
+    - vendor/bin/phpunit --colors=never
+  coverage: '/^\s*Lines:\s*\d+.\d+\%/'
+
 pages:
   stage: deploy
   timeout: 10 minutes

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,3 +12,15 @@ services:
     #environment:
     #  - PRELOAD=/var/www/aplus/preload.php
     tty: true
+  lempa-last:
+    image: registry.gitlab.com/aplus-framework/images/lempa:3
+    container_name: lempa-app-last
+    working_dir: /var/www/aplus
+    volumes:
+      - .:/var/www/aplus
+    ports:
+      - "80:80"
+      - "443:443"
+    #environment:
+    #  - PRELOAD=/var/www/aplus/preload.php
+    tty: true