From 65df977c6165f7027097805fa62618a7585fa108 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Mon, 19 Dec 2022 19:35:58 -0300 Subject: [PATCH 1/5] Update CI tests on GitLab --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b692d0a..98c72eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ test:php: MYSQL_DATABASE: framework-tests MYSQL_ROOT_PASSWORD: password before_script: + - php -v - composer update script: - composer normalize --dry-run --indent-size=4 --indent-style=space From e75897237bacf702f2fc63eaa1b1681a2afcd049 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Thu, 29 Dec 2022 18:38:47 -0300 Subject: [PATCH 2/5] Add job to test latest PHP version --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98c72eb..3bfd9f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,27 @@ test:php: - build/docs/ coverage: '/^\s*Lines:\s*\d+.\d+\%/' +test:php-last: + image: registry.gitlab.com/aplus-framework/images/base:3 + stage: test + timeout: 10 minutes + cache: + paths: + - vendor/ + services: + - mariadb + - memcached + - redis + variables: + MYSQL_DATABASE: framework-tests + MYSQL_ROOT_PASSWORD: password + before_script: + - php -v + - composer update + script: + - vendor/bin/phpunit --colors=never + coverage: '/^\s*Lines:\s*\d+.\d+\%/' + pages: stage: deploy timeout: 10 minutes From 9bf58968341e942785d0f8799c5e43e085b278e3 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Fri, 30 Dec 2022 18:40:04 -0300 Subject: [PATCH 3/5] Add service package-last --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 159c053..1cfd3c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,15 @@ services: depends_on: - mariadb tty: true + package-last: + image: registry.gitlab.com/aplus-framework/images/package:3 + container_name: package-mvc-last + working_dir: /package + volumes: + - .:/package + depends_on: + - mariadb + tty: true mariadb: image: mariadb restart: always From 3b5d1a5f81eb517deae17fab109ac89179f21d6f Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Sat, 31 Dec 2022 09:43:32 -0300 Subject: [PATCH 4/5] Update tests workflow --- .github/workflows/tests.yml | 58 +++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 40820a6..d1009d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,8 +13,6 @@ jobs: strategy: fail-fast: true - matrix: - php: ['8.1'] services: mariadb: @@ -36,7 +34,7 @@ jobs: ports: - 6379:6379 - name: PHP ${{ matrix.php }} + name: PHP 8.1 steps: - name: Checkout @@ -45,7 +43,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} + php-version: 8.1 tools: composer coverage: xdebug @@ -84,4 +82,54 @@ 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: 10 + + strategy: + fail-fast: true + + services: + mariadb: + image: mariadb + env: + MYSQL_DATABASE: framework-tests + MYSQL_ROOT_PASSWORD: password + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + memcached: + image: memcached + ports: + - 11211:11211 + + redis: + image: redis + ports: + - 6379:6379 + + 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 + env: + DB_HOST: 127.0.0.1 + MEMCACHED_HOST: 127.0.0.1 + REDIS_HOST: 127.0.0.1 + run: vendor/bin/phpunit --verbose From 1955508d4b5366aa99c5a113c90b052b93f1702a Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Sun, 1 Jan 2023 22:49:38 -0300 Subject: [PATCH 5/5] Use checkout v3 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d1009d2..4570faf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -114,7 +114,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2