Skip to content

Commit 6c24d31

Browse files
(experimental) CI workflow split (#634)
* PoC: shared CI workflow * PoC: preparing ExtRdKafka, MySqli & Laravel to run in main. * Fix ExtRdKafka workflow.
1 parent 39ab544 commit 6c24d31

4 files changed

Lines changed: 13 additions & 3 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.php diff=php
55

66
/.gitattributes export-ignore
7+
/.github export-ignore
78
/.gitignore export-ignore
89
/.phan export-ignore
910
/.php-cs-fixer.php export-ignore

.github/workflows/contrib-ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Contrib CI Pipeline
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
CI:
7+
uses: open-telemetry/opentelemetry-php-contrib/.github/workflows/instrumentation-laravel.yml@main
8+
with:
9+
package-root: '.'

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"php-http/mock-client": "*",
3838
"phpstan/phpstan": "^1.1",
3939
"phpstan/phpstan-phpunit": "^1.0",
40-
"phpunit/phpunit": "^9.5",
40+
"phpunit/phpunit": "^9.5 || ^10 || ^11 || ^12 || ^13",
4141
"psalm/plugin-phpunit": "^0.19.2",
4242
"spatie/laravel-ignition": "*",
4343
"vimeo/psalm": "6.4.0"

tests/Unit/Watches/RedisCommand/SerializerTest.php renamed to tests/Unit/Watchers/RedisCommand/SerializerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace OpenTelemetry\Tests\Contrib\Instrumentation\Laravel\Unit\Watches\RedisCommand;
5+
namespace OpenTelemetry\Tests\Contrib\Instrumentation\Laravel\Unit\Watchers\RedisCommand;
66

77
use OpenTelemetry\Contrib\Instrumentation\Laravel\Watchers\RedisCommand\Serializer;
88
use PHPUnit\Framework\TestCase;
@@ -17,7 +17,7 @@ public function testSerialize($command, $params, $expected): void
1717
$this->assertSame($expected, Serializer::serializeCommand($command, $params));
1818
}
1919

20-
public function serializeCases(): iterable
20+
public static function serializeCases(): iterable
2121
{
2222
// Only serialize command
2323
yield ['ECHO', ['param1'], 'ECHO [1 other arguments]'];

0 commit comments

Comments
 (0)