From 422eeb6ca5b6633000d8ae9dc502385c436f015b Mon Sep 17 00:00:00 2001 From: Asko Nõmm Date: Sun, 1 Feb 2026 11:28:00 +0200 Subject: Refactor CI workflows to install PHP and Composer directly; update to use Docker for consistency --- .forgejo/workflows/coverage.yml | 24 +++++++++++------------- .forgejo/workflows/lint.yml | 19 +++++++++++++------ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.forgejo/workflows/coverage.yml b/.forgejo/workflows/coverage.yml index cc464c8..172c352 100644 --- a/.forgejo/workflows/coverage.yml +++ b/.forgejo/workflows/coverage.yml @@ -15,19 +15,17 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up php - uses: shivammathur/setup-php@v2 - with: - php-version: "8.3" - coverage: xdebug - - - name: Set-up Composer - uses: php-actions/composer@v6 + - name: Set up php 8.3 with xdebug & composer + run: | + apt-get update + apt-get install -y php8.3 php8.3-cli php8.3-xdebug php8.3-mbstring php8.3-xml php8.3-curl php8.3-zip unzip + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php --install-dir=/usr/local/bin --filename=composer + php -r "unlink('composer-setup.php');" + echo "xdebug.mode=coverage" >> /etc/php/8.3/cli/php.ini + echo "xdebug.start_with_request=yes" >> /etc/php/8.3/cli/php.ini + php -v + composer --version - name: Run tests and collect coverage run: ./vendor/bin/phpunit tests --coverage-clover coverage.xml tests - - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/.forgejo/workflows/lint.yml b/.forgejo/workflows/lint.yml index fad6051..4417fe0 100644 --- a/.forgejo/workflows/lint.yml +++ b/.forgejo/workflows/lint.yml @@ -7,19 +7,26 @@ name: Lint jobs: lint: name: Lint - runs-on: ubuntu-latest + runs-on: docker + container: + image: node:20 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up php 8.3 - uses: shivammathur/setup-php@v2 - with: - php-version: "8.3" + run: | + apt-get update + apt-get install -y php8.3 php8.3-cli php8.3-mbstring php8.3-xml php8.3-curl php8.3-zip unzip + php -v - name: Set-up Composer - uses: php-actions/composer@v6 + run: | + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php --install-dir=/usr/local/bin --filename=composer + php -r "unlink('composer-setup.php');" + composer --version - name: Run phpstan run: ./vendor/bin/phpstan -- cgit v1.2.3