diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 68dadb9c01b..56d3942e5c6 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -83,6 +83,24 @@ compile-test-assets: - "${WEBPACK_COMPILE_LOG_PATH}" when: always +build-vite-prod: + extends: + - .production + - .default-retry + - .with-ci-node-image + - .frontend:rules:compile-production-assets + artifacts: + expire_in: 1h + paths: + - public/vite-dev/ + stage: prepare + needs: [] + script: + - source scripts/utils.sh + - yarn_install_script + - yarn vite-prod + allow_failure: true + gdk:compile-test-assets: extends: - compile-test-assets diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 1f77553826f..853b792c320 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -376,6 +376,7 @@ - "{package.json,yarn.lock}" - ".browserslistrc" - "babel.config.js" + - "vite.config.js" - "config/webpack.config.js" - "config/**/*.js" - "{,ee/,jh/}app/assets/**/*" @@ -388,6 +389,7 @@ - "{Gemfile.next,Gemfile.next.lock}" - ".browserslistrc" - "babel.config.js" + - "vite.config.js" - "config/webpack.config.js" - "*.js" - "config/**/*.js" @@ -544,6 +546,7 @@ - "*_VERSION" - "lib/gitlab/redis/*" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -574,6 +577,7 @@ - "{package.json,yarn.lock}" - "*_VERSION" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -611,6 +615,7 @@ - "{package.json,yarn.lock}" - "*_VERSION" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -648,6 +653,7 @@ - "{package.json,yarn.lock}" - "*_VERSION" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -686,6 +692,7 @@ - "{package.json,yarn.lock}" - ".browserslistrc" - "babel.config.js" + - "vite.config.js" - "jest.config.{base,integration,unit}.js" - ".stylelintrc" - "Dockerfile.assets" diff --git a/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml b/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml index 09c791261cf..0e47e79d730 100644 --- a/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml +++ b/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml @@ -65,7 +65,6 @@ Gitlab/RSpec/MisplacedEeSpecFile: - 'ee/spec/graphql/types/gitlab_subscriptions/member_management/users_queued_for_role_promotion_type_spec.rb' - 'ee/spec/graphql/types/issue_connection_type_spec.rb' - 'ee/spec/graphql/types/issue_type_spec.rb' - - 'ee/spec/graphql/types/namespaces/user_level_permissions/group_namespace_user_level_permissions_type_spec.rb' - 'ee/spec/graphql/types/permission_types/group_spec.rb' - 'ee/spec/graphql/types/permission_types/namespaces/base_spec.rb' - 'ee/spec/graphql/types/permission_types/project_spec.rb' diff --git a/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue b/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue index b5097997939..e649ff3889c 100644 --- a/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue +++ b/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue @@ -130,7 +130,7 @@ export default {