Skip to content
Snippets Groups Projects
Commit 381e5ae5c4a1 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'andrey-ce-mode-repo' into 'master'

Remove ee folder for non-ee builds

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6803



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
No related branches found
No related tags found
3 merge requests!102heptapod#1237: making 0.38 the new oldstable,!96Merged heptapod branch for upstream 15.11 in heptapod-stable,!93Merged upstream 15.11.0+rc42+ce.0
......@@ -70,6 +70,12 @@
build do
env = with_standard_compiler_flags(with_embedded_path)
# Remove ee code when building in CE mode from canonical source
if !EE && File.directory?('ee')
delete 'ee'
delete 'CHANGELOG-EE.md'
end
# Exclude rails directory from cache
cache_dir = File.join('/var/cache/omnibus/cache/git_cache', install_dir, 'info/exclude')
command "echo '/embedded/service/gitlab-rails' >> #{cache_dir}"
......
......@@ -577,7 +577,7 @@
when: never
- if: '$PIPELINE_TYPE =~ /TRIGGERED_CE_PIPELINE/'
variables:
FOSS_ONLY: "true"
FOSS_ONLY: "1"
- if: '$PIPELINE_TYPE =~ /TRIGGERED_EE_PIPELINE/'
needs:
- job: generate-facts
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment