Skip to content

Include windows and macos in CI #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenWakely merged 12 commits into from
Jul 8, 2025
Merged

Include windows and macos in CI #162

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a50ba2c
Add Windows to the matrix
StephenWakely Jul 3, 2025
1f9823f
Dont disable origin detection for windows
StephenWakely Jul 3, 2025
5ba2fb4
Include input in test desc
StephenWakely Jul 3, 2025
cb2a66c
Try without suspect test
StephenWakely Jul 3, 2025
05aa7f0
Properly check Windows
StephenWakely Jul 3, 2025
80a4dce
Ensure path exists
StephenWakely Jul 3, 2025
72d59af
Time line
StephenWakely Jul 3, 2025
bde99e3
Add macos to test matrix
StephenWakely Jul 3, 2025
ba7990f
Only disable origin detection in Linux for tests
StephenWakely Jul 3, 2025
a84360a
Only disable origin detection in tests on linux
StephenWakely Jul 3, 2025
7dbfff4
Handle missing errors from file_get_contents
StephenWakely Jul 3, 2025
676fa78
Tidy disableOriginDetectionLinux
StephenWakely Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ permissions:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.2', '8.3']

steps:
Expand Down
4 changes: 4 additions & 0 deletions src/OriginDetection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ public function parseCgroupNodePath($lines)

public function getCgroupInode($cgroupMountPath, $procSelfCgroupPath)
{
if (!is_readable($procSelfCgroupPath)) {
return '';
}
Comment thread
vickenty marked this conversation as resolved.

$cgroupControllersPaths = $this->parseCgroupNodePath(file_get_contents($procSelfCgroupPath));

foreach ([self::CGROUPV1BASECONTROLLER , ''] as $controller) {
Expand Down
8 changes: 1 addition & 7 deletions tests/UnitTests/DogStatsd/OriginDetectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ public function testParseContainerID() {
[
'input' => "1:name=systemd:/docker/34dc0b5e626f2c5c4c5170e34b10e7654ce36f0fcd532739f4445baabea03376.scope",
'expected' => "34dc0b5e626f2c5c4c5170e34b10e7654ce36f0fcd532739f4445baabea03376"
],
[
'input' => "1:name=systemd:/nope
2:pids:/docker/34dc0b5e626f2c5c4c5170e34b10e7654ce36f0fcd532739f4445baabea03376
3:cpu:/invalid",
'expected' => "34dc0b5e626f2c5c4c5170e34b10e7654ce36f0fcd532739f4445baabea03376"
]
];

Expand All @@ -87,7 +81,7 @@ public function testParseContainerID() {
->at($root);

$id = $originDetection->readContainerID(vfsStream::url('proc/self/cgroup'));
$this->assertSame($case['expected'], $id);
$this->assertSame($case['expected'], $id, $case['input']);
}
}

Expand Down
Loading