Merge branch 'alberts-static-analysis-as-if-foss' into 'master'

Add `static-analysis as-if-foss` job

See merge request gitlab-org/gitlab!60363

.gitlab/ci/rails.gitlab-ci.yml

@@ -250,13 +250,19 @@ update-static-analysis-cache:
 static-analysis:
   extends:
     - .static-analysis-base
-    - .rails:rules:code-backstage-qa
+    - .static-analysis:rules:ee-and-foss
   stage: test
   parallel: 4
   script:
     - run_timed_command "retry yarn install --frozen-lockfile"
     - scripts/static-analysis
 
+static-analysis as-if-foss:
+  extends:
+    - static-analysis
+    - .static-analysis:rules:as-if-foss
+    - .as-if-foss
+
 rspec migration pg11:
   extends:
     - .rspec-base-pg11

.gitlab/ci/rules.gitlab-ci.yml

@@ -931,6 +931,25 @@
     - <<: *if-merge-request
       changes: [".gitlab/ci/rails.gitlab-ci.yml"]
 
+#########################
+# Static analysis rules #
+#########################
+
+.static-analysis:rules:ee-and-foss:
+  rules:
+    - changes: *code-backstage-qa-patterns
+
+.static-analysis:rules:as-if-foss:
+  rules:
+    - <<: *if-not-ee
+      when: never
+    - <<: *if-merge-request-title-as-if-foss
+      changes: *code-backstage-qa-patterns
+    - <<: *if-security-merge-request
+      changes: *code-backstage-qa-patterns
+    - <<: *if-merge-request
+      changes: *ci-patterns
+
 #######################
 # Vendored gems rules #
 #######################

app/assets/javascripts/boards/stores/actions.js

 import * as Sentry from '@sentry/browser';
-import { updateListQueries } from 'ee_else_ce/boards/constants';
-import createBoardListMutation from 'ee_else_ce/boards/graphql/board_list_create.mutation.graphql';
-import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql';
-import issueMoveListMutation from 'ee_else_ce/boards/graphql/issue_move_list.mutation.graphql';
 import {
   BoardType,
   ListType,
@@ -12,7 +8,11 @@ import {
   titleQueries,
   subscriptionQueries,
   SupportedFilters,
-} from '~/boards/constants';
+  updateListQueries,
+} from 'ee_else_ce/boards/constants';
+import createBoardListMutation from 'ee_else_ce/boards/graphql/board_list_create.mutation.graphql';
+import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql';
+import issueMoveListMutation from 'ee_else_ce/boards/graphql/issue_move_list.mutation.graphql';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import { convertObjectPropsToCamelCase, urlParamsToObject } from '~/lib/utils/common_utils';

ee/app/assets/javascripts/boards/constants.js

@@ -68,6 +68,19 @@ export const updateListQueries = {
   },
 };
 
+// re-export some FOSS constants so that lint does not yell
+// https://gitlab.com/gitlab-org/gitlab/-/issues/329164
+export {
+  BoardType,
+  ListType,
+  inactiveId,
+  flashAnimationDuration,
+  ISSUABLE,
+  titleQueries,
+  subscriptionQueries,
+  SupportedFilters,
+} from '~/boards/constants';
+
 export default {
   updateListQueries,
   DRAGGABLE_TAG,