From adf743b1412d592c7c199de53422ef7ee122f3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 2 May 2023 16:09:37 +0200 Subject: [PATCH 1/3] Remove the array_pop failing tests on 32bit CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- tests/lib/Template/JSResourceLocatorTest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index 627fe676680..fcc27f790f1 100644 --- a/tests/lib/Template/JSResourceLocatorTest.php +++ b/tests/lib/Template/JSResourceLocatorTest.php @@ -135,7 +135,6 @@ class JSResourceLocatorTest extends \Test\TestCase { $this->assertEquals($expectedWebRoot, $webRoot); $this->assertEquals($expectedFile, $file); - array_pop(\OC::$APPSROOTS); //unlink($new_apps_path_symlink); //$this->rrmdir($new_apps_path); } @@ -173,8 +172,7 @@ class JSResourceLocatorTest extends \Test\TestCase { $this->assertEquals($expectedWebRoot, $resources[$idx][1]); $this->assertEquals($expectedFiles[$idx], $resources[$idx][2]); } - - array_pop(\OC::$APPSROOTS); + $this->rrmdir($new_apps_path); } } From 95d98b57ec2b35f6e10ef3cd100b6287a9031d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 2 May 2023 16:10:20 +0200 Subject: [PATCH 2/3] Run 32bit CI on workflow modifications and new releases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .github/workflows/phpunit-32bits.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index 100c95bd210..ef81b2226e6 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -1,6 +1,10 @@ name: PHPUnit 32bits on: + pull_request: + paths: + - 'version.php' + - '.github/workflows/phpunit-32bits.yml' workflow_dispatch: schedule: - cron: "15 1 * * 1-6" From e252182d8046ce0254dc37137d77e1b30c2fd387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 2 May 2023 16:24:28 +0200 Subject: [PATCH 3/3] Put back file cleanups, and remove dead code in tests/lib/Template/JSResourceLocatorTest.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- tests/lib/Template/JSResourceLocatorTest.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index fcc27f790f1..9ac6a32e22c 100644 --- a/tests/lib/Template/JSResourceLocatorTest.php +++ b/tests/lib/Template/JSResourceLocatorTest.php @@ -135,8 +135,8 @@ class JSResourceLocatorTest extends \Test\TestCase { $this->assertEquals($expectedWebRoot, $webRoot); $this->assertEquals($expectedFile, $file); - //unlink($new_apps_path_symlink); - //$this->rrmdir($new_apps_path); + unlink($new_apps_path_symlink); + $this->rrmdir($new_apps_path); } public function testFindModuleJSWithFallback() { @@ -164,7 +164,6 @@ class JSResourceLocatorTest extends \Test\TestCase { $resources = $locator->getResources(); $this->assertCount(3, $resources); - $expectedRoot = $new_apps_path . '/test-js-app'; $expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app'; $expectedFiles = ['module.mjs', 'both.mjs', 'plain.js'];