Skip to content

Commit 7fcf42a

Browse files
authored
Merge pull request #38024 from nextcloud/fix/fix-32bits-ci
Fix 32bits ci
2 parents ef87dfc + e252182 commit 7fcf42a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/phpunit-32bits.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: PHPUnit 32bits
22

33
on:
4+
pull_request:
5+
paths:
6+
- 'version.php'
7+
- '.github/workflows/phpunit-32bits.yml'
48
workflow_dispatch:
59
schedule:
610
- cron: "15 1 * * 1-6"

tests/lib/Template/JSResourceLocatorTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ public function testFindWithAppPathSymlink() {
135135
$this->assertEquals($expectedWebRoot, $webRoot);
136136
$this->assertEquals($expectedFile, $file);
137137

138-
array_pop(\OC::$APPSROOTS);
139-
//unlink($new_apps_path_symlink);
140-
//$this->rrmdir($new_apps_path);
138+
unlink($new_apps_path_symlink);
139+
$this->rrmdir($new_apps_path);
141140
}
142141

143142
public function testFindModuleJSWithFallback() {
@@ -165,16 +164,14 @@ public function testFindModuleJSWithFallback() {
165164
$resources = $locator->getResources();
166165
$this->assertCount(3, $resources);
167166

168-
$expectedRoot = $new_apps_path . '/test-js-app';
169167
$expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app';
170168
$expectedFiles = ['module.mjs', 'both.mjs', 'plain.js'];
171169

172170
for ($idx = 0; $idx++; $idx < 3) {
173171
$this->assertEquals($expectedWebRoot, $resources[$idx][1]);
174172
$this->assertEquals($expectedFiles[$idx], $resources[$idx][2]);
175173
}
176-
177-
array_pop(\OC::$APPSROOTS);
174+
178175
$this->rrmdir($new_apps_path);
179176
}
180177
}

0 commit comments

Comments
 (0)