test(ci): Do not always run e2e tests

Signed-off-by: Louis Chmn <louis@chmn.me>

Author: CarlSchwan

.github/workflows/cypress.yml

@@ -8,7 +8,14 @@
 
 name: Cypress
 
-on: pull_request
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - labeled
 
 concurrency:
   group: cypress-${{ github.head_ref || github.run_id }}
@@ -24,13 +31,42 @@ env:
   # n.b. server will use head_ref, as we want to test the PR branch.
   BRANCH: ${{ github.base_ref || github.ref_name }}
 
-
 permissions:
   contents: read
+  pull-requests: read
 
 jobs:
+  gate:
+    runs-on: ubuntu-latest-low
+    steps:
+      - name: Evaluate e2e tests execution conditions
+        id: gate-e2e
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v8.0.0
+        with:
+          script: |
+            const pr = context.payload.pull_request
+
+            const hasForceLabel = pr.labels.some((label) => label.name === 'force-e2e-tests')
+            const hasToReviewLabel = pr.labels.some((label) => label.name === '3. to review')
+            const hasToReleaseLabel = pr.labels.some((label) => label.name === '4. to release')
+
+            const files = await github.paginate(github.rest.pulls.listFiles, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: pr.number,
+              per_page: 100,
+            })
+            const cypressTouched = files.some((file) => file.filename.startsWith('cypress'))
+
+            if (hasForceLabel || hasToReviewLabel || hasToReleaseLabel || cypressTouched) {
+              return
+            } else {
+              core.setFailed('Skipping Cypress: draft state, missing labels or no cypress path changes.')
+            }
+
   init:
     runs-on: ubuntu-latest
+    needs: gate
     outputs:
       nodeVersion: ${{ steps.versions.outputs.nodeVersion }}
       npmVersion: ${{ steps.versions.outputs.npmVersion }}
@@ -98,7 +134,7 @@ jobs:
 
   cypress:
     runs-on: ubuntu-latest
-    needs: init
+    needs: [gate, init]
 
     strategy:
       fail-fast: false

.github/workflows/playwright.yml

@@ -5,16 +5,51 @@ name: Playwright Tests
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - labeled
 
 permissions:
   contents: read
 
 jobs:
+  gate:
+    runs-on: ubuntu-latest-low
+    steps:
+      - name: Evaluate e2e tests execution conditions
+        id: gate-e2e
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v8.0.0
+        with:
+          script: |
+            const pr = context.payload.pull_request
+
+            const hasForceLabel = pr.labels.some((label) => label.name === 'force-e2e-tests')
+            const hasToReviewLabel = pr.labels.some((label) => label.name === '3. to review')
+            const hasToReleaseLabel = pr.labels.some((label) => label.name === '4. to release')
+
+            const files = await github.paginate(github.rest.pulls.listFiles, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: pr.number,
+              per_page: 100,
+            })
+            const playwrightTouched = files.some((file) => file.filename.startsWith('tests/playwright'))
+
+            if (hasForceLabel || hasToReviewLabel || hasToReleaseLabel || playwrightTouched) {
+              return
+            } else {
+              core.setFailed('Skipping Playwright: draft state, missing labels or no playwright path changes.')
+            }
+
   playwright-setup:
     timeout-minutes: 15
     name: Playwright setup
     runs-on: ubuntu-latest
+    needs: gate
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
@@ -40,7 +75,7 @@ jobs:
         path: ./
 
   playwright-tests:
-    needs: [playwright-setup]
+    needs: [gate, playwright-setup]
     timeout-minutes: 60
     name: Playwright tests ${{ matrix.shardIndex }} / ${{ matrix.shardTotal }}
     runs-on: ubuntu-latest
@@ -115,7 +150,7 @@ jobs:
   merge-reports:
     # Merge reports after playwright-tests, even if some shards have failed
     if: ${{ !cancelled() }}
-    needs: [playwright-tests]
+    needs: [gate, playwright-tests]
 
     runs-on: ubuntu-latest-low
     steps:
@@ -171,7 +206,7 @@ jobs:
     permissions:
       contents: none
     runs-on: ubuntu-latest-low
-    needs: [playwright-tests]
+    needs: [gate, playwright-tests]
 
     if: always()
 

config/config.sample.php

@@ -1659,15 +1659,6 @@
 	 */
 	'comments.managerFactory' => '\OC\Comments\ManagerFactory',
 
-	/**
-	 * Replaces the default System Tags Manager Factory. This can be utilized if an
-	 * own or 3rd-party SystemTagsManager should be used that – for instance – uses the
-	 * filesystem instead of the database to keep the tags.
-	 *
-	 * Defaults to ``\OC\SystemTag\ManagerFactory``
-	 */
-	'systemtags.managerFactory' => '\OC\SystemTag\ManagerFactory',
-
 	/**
 	 * Maintenance
 	 *

lib/private/Activity/EventMerger.php

@@ -10,14 +10,15 @@
 use OCP\Activity\IEvent;
 use OCP\Activity\IEventMerger;
 use OCP\IL10N;
+use OCP\L10N\IFactory;
 
 class EventMerger implements IEventMerger {
-	/**
-	 * @param IL10N $l10n
-	 */
+	private readonly IL10N $l10n;
+
 	public function __construct(
-		protected IL10N $l10n,
+		IFactory $factory,
 	) {
+		$this->l10n = $factory->get('lib');
 	}
 
 	/**

lib/private/App/AppStore/Bundles/BundleFetcher.php

@@ -8,11 +8,14 @@
 namespace OC\App\AppStore\Bundles;
 
 use OCP\IL10N;
+use OCP\L10N\IFactory;
 
 class BundleFetcher {
+	private IL10N $l10n;
 	public function __construct(
-		private IL10N $l10n,
+		IFactory $factory,
 	) {
+		$this->l10n = $factory->get('lib');
 	}
 
 	/**

lib/private/Diagnostics/QueryLogger.php

@@ -8,6 +8,7 @@
 
 namespace OC\Diagnostics;
 
+use OC\SystemConfig;
 use OCP\Cache\CappedMemoryCache;
 use OCP\Diagnostics\IQueryLogger;
 
@@ -20,7 +21,11 @@ class QueryLogger implements IQueryLogger {
 	/**
 	 * QueryLogger constructor.
 	 */
-	public function __construct() {
+	public function __construct(SystemConfig $config) {
+		if ($config->getValue('debug', false)) {
+			// In debug mode, module is being activated by default
+			$this->activate();
+		}
 		$this->queries = new CappedMemoryCache(1024);
 	}