diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index df687ad0fd..3e9705f269 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -4,7 +4,10 @@ name: Testing Friendica -on: [workflow_dispatch] +on: + push: + pull_request: + workflow_dispatch: jobs: friendica: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml deleted file mode 100644 index c6a7ce3d26..0000000000 --- a/.github/workflows/tests.yml +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: 2010 - 2024 the Friendica project -# -# SPDX-License-Identifier: CC0-1.0 - -name: Src tests - -on: - push: - pull_request: - workflow_dispatch: - -jobs: - - tests: - name: Src tests (PHP ${{ matrix.php }}) - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - operating-system: ['ubuntu-latest'] - php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5'] - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - - name: Setup PHP with composer and extensions - uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php - with: - php-version: ${{ matrix.php }} - coverage: xdebug - tools: none - - - name: Clone addon repository - run: git clone -b develop --single-branch https://git.friendi.ca/friendica/friendica-addons.git addon - - - name: Install Composer dependencies - uses: "ramsey/composer-install@v2" - - - name: Run Unit tests - run: composer run test -- tests/src --configuration tests/phpunit.xml -d memory_limit=-1 \ No newline at end of file