diff --git a/.github/workflows/deployRelease.yml b/.github/workflows/deployRelease.yml index c5e6f6a3..01945e53 100644 --- a/.github/workflows/deployRelease.yml +++ b/.github/workflows/deployRelease.yml @@ -2,7 +2,7 @@ name: Deploy Release on: workflow_run: - workflows: ["PHP Tests on Linux"] + workflows: ["JS Test and DokuWiki Default Tasks"] branches: [master] types: - completed diff --git a/.github/workflows/phpTestLinux.yml b/.github/workflows/phpTestLinux.yml deleted file mode 100644 index fbad8a60..00000000 --- a/.github/workflows/phpTestLinux.yml +++ /dev/null @@ -1,71 +0,0 @@ -name: PHP Tests on Linux - -on: [push, pull_request] - -jobs: - testLinux: - name: PHP ${{ matrix.php-versions }} DokuWiki ${{ matrix.dokuwiki-branch }} - runs-on: ubuntu-latest - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - - strategy: - matrix: - php-versions: ['7.2', '7.3', '7.4', '8.0'] - dokuwiki-branch: [ 'stable' ] - exclude: - - dokuwiki-branch: 'stable' - php-versions: '8.0' - fail-fast: false - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - extensions: mbstring, intl, PDO, pdo_sqlite, bz2 - ini-values: pcre.jit=0 - - - name: Setup problem matchers - run: | - echo ::add-matcher::${{ runner.tool_cache }}/php.json - echo ::add-matcher::${{ runner.tool_cache }}/phpunit.json - - - name: Download DokuWiki Test-setup - run: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh - - - name: Run DokuWiki Test-setup - env: - CI_SERVER: 1 - DOKUWIKI: ${{ matrix.dokuwiki-branch }} - run: sh travis.sh - - - name: Setup PHPUnit - run: | - php _test/fetchphpunit.php - cd _test - - - name: Run PHPUnit - run: | - cd _test - php phpunit.phar --verbose --stderr --group plugin_prosemirror - - testJavaScript: - name: JavaScript Tests - runs-on: ubuntu-latest - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup - run: | - yarn install - - - name: Run Tests - run: | - yarn test - yarn lint diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..3cd6fbc2 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,24 @@ +name: JS Test and DokuWiki Default Tasks +on: + push: + pull_request: + schedule: + - cron: '15 6 20 * *' +jobs: + testJavaScript: + name: JavaScript Tests + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup + run: | + yarn install + + - name: Run Tests + run: | + yarn test + yarn lint + testPHP: + uses: dokuwiki/github-action/.github/workflows/all.yml@main