Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude enterprise edition files from community edition builds #2550

Merged
merged 2 commits into from
Aug 12, 2020
Merged

Exclude enterprise edition files from community edition builds #2550

merged 2 commits into from
Aug 12, 2020

Conversation

maciaszczykm
Copy link
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2408

Special notes for your reviewer:

Release note:

Excluded enterprise edition files from community edition builds.

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Aug 10, 2020
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: maciaszczykm

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 10, 2020
@kubermatic-bot kubermatic-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 11, 2020
maciaszczykm
maciaszczykm commented Aug 11, 2020
View reviewed changes
package.json
@@ -12,7 +12,7 @@
"start:local": "npm run vi && ng serve --configuration=local",
"start:e2e": "npm run vi && ng serve --configuration=e2e",
"start:e2e-local": "npm run vi && ng serve --configuration=e2e-local",
"build": "npm run vi && ng build --prod",
"build": "npm run vi && ng build --prod --tsConfig=src/tsconfig.\"${KUBERMATIC_EDITION:=ee}\".json",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks to this change we will be able to use tsconfig.ee.json or tsconfig.ce.json depending on the KUBERMATIC_EDITION environment variable. KUBERMATIC_EDITION will be defaulted to ee if it is not set.

maciaszczykm
maciaszczykm commented Aug 11, 2020
View reviewed changes
src/tsconfig.ce.json
"test*.ts",
"**/*.spec.ts",
"**/testing/**",
"app/dynamic/enterprise/**"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the community edition all of the enterprise edition sources will be excluded.

maciaszczykm
maciaszczykm commented Aug 11, 2020
View reviewed changes
angular.json
@@ -16,7 +16,7 @@
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"tsConfig": "src/tsconfig.ee.json",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use src/tsconfig.ee.json by default. Additionally, in the development there is no need to exclude any sources. It has to be done for builds only.

@maciaszczykm maciaszczykm marked this pull request as ready for review August 11, 2020 10:00
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 11, 2020
@maciaszczykm
Copy link
Contributor Author

@kgroschoff @floreks Can you review? I've already checked dist contents in both scenarios and it seems fine but please verify :)

@codecov
Copy link

codecov bot commented Aug 11, 2020 •
edited
Loading

Codecov Report

Merging #2550 into master will increase coverage by 1.12%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2550      +/-   ##
==========================================
+ Coverage   51.31%   52.44%   +1.12%     
==========================================
  Files         226      226              
  Lines        7935     7936       +1     
  Branches      967      969       +2     
==========================================
+ Hits         4072     4162      +90     
+ Misses       3861     3771      -90     
- Partials        2        3       +1
Impacted Files Coverage Δ
src/app/core/services/project/project.service.ts 17.18% <0.00%> (-0.28%) ⬇️
src/app/node-data/dialog/component.ts 27.39% <0.00%> (-0.14%) ⬇️
src/app/node-data/service/service.ts 64.51% <0.00%> (+2.01%) ⬆️
src/app/shared/utils/member-utils/member-utils.ts 84.84% <0.00%> (+3.03%) ⬆️
src/app/testing/services/project-mock.service.ts 83.33% <0.00%> (+16.66%) ⬆️
src/app/project/project.component.ts 69.81% <0.00%> (+31.96%) ⬆️
...t-name-in-circle/short-name-in-circle.component.ts 100.00% <0.00%> (+82.60%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8161bed...e2425a4. Read the comment docs.

@maciaszczykm
Copy link
Contributor Author

/retest

@floreks
Copy link
Contributor

floreks commented Aug 12, 2020

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b9d37ce85a9048c6f966fef6e491daa1cb9adcea

@kubermatic-bot kubermatic-bot merged commit 798f241 into kubermatic:master Aug 12, 2020
@maciaszczykm maciaszczykm deleted the feature/exclude-files branch August 12, 2020 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@floreks floreks

@kgroschoff kgroschoff

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove enterprise edition sources completely from community edition builds
4 participants
@maciaszczykm @kubermatic-bot @floreks @kgroschoff