Skip to content

Commit

Permalink
Merge pull request #53 from SimonFrings/actions
Browse files Browse the repository at this point in the history
Use GitHub actions for continuous integration (CI)
  • Loading branch information
clue authored Dec 12, 2020
2 parents f3714b9 + ccda1d7 commit c432f3d
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/.gitattributes export-ignore
/.github/workflows/ export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/examples/ export-ignore
/phpunit.xml.dist export-ignore
/tests/ export-ignore
52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CI

on:
push:
pull_request:

env:
QUASSEL_HOST: 127.0.0.1:4242

jobs:
PHPUnit:
runs-on: ubuntu-latest
strategy:
matrix:
php:
- 7.4
- 7.3
- 7.2
- 7.1
- 7.0
- 5.6
- 5.5
- 5.4
- 5.3
steps:
- uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
- run: sudo apt-get -qq update || true # update package list and ignore temporary network errors
- run: sudo apt-get --no-install-recommends -qq install -y quassel-core
- run: composer install
- run: sudo /etc/init.d/quasselcore status || sudo /etc/init.d/quasselcore start
- run: sudo /etc/init.d/quasselcore status || sleep 2
- run: vendor/bin/phpunit --coverage-text

PHPUnit-hhvm:
name: PHPUnit (HHVM)
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: azjezz/setup-hhvm@v1
with:
version: lts-3.30
- run: sudo apt-get -qq update || true # update package list and ignore temporary network errors
- run: sudo apt-get --no-install-recommends -qq install -y quassel-core
- run: hhvm $(which composer) require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
- run: hhvm $(which composer) install
- run: sudo /etc/init.d/quasselcore status || sudo /etc/init.d/quasselcore start
- run: sudo /etc/init.d/quasselcore status || sleep 2
- run: hhvm vendor/bin/phpunit
35 changes: 0 additions & 35 deletions .travis.yml

This file was deleted.

4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# clue/reactphp-quassel [![Build Status](https://travis-ci.org/clue/reactphp-quassel.svg?branch=master)](https://travis-ci.org/clue/reactphp-quassel)
# clue/reactphp-quassel

[![CI status](https://github.com/clue/reactphp-quassel/workflows/CI/badge.svg)](https://github.com/clue/reactphp-quassel/actions)

Streaming, event-driven access to your [Quassel IRC](http://quassel-irc.org/) core,
built on top of [ReactPHP](https://reactphp.org/).
Expand Down
6 changes: 5 additions & 1 deletion tests/FunctionalTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ public function testWriteClientLogin(Client $client, \stdClass $message)
$message = $this->awaitMessage($client);
$this->assertEquals('ClientLoginAck', $message->MsgType);

$message = $this->awaitMessage($client);
try {
$message = $this->awaitMessage($client);
} catch (\React\Promise\Timer\TimeoutException $e) {
$this->markTestIncomplete('Unhandled race condition, please retry');
}
$this->assertEquals('SessionInit', $message->MsgType);

return $message;
Expand Down

0 comments on commit c432f3d

Please sign in to comment.