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.

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

Keep build folder ... kills circular-json #34841

Merged
merged 4 commits into from Mar 20, 2019

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Mar 20, 2019

Forward port from stable10 PR #33665
"Keep build folder ... kills circular-json"
and
"Adding modclean to have smaller release tar balls" b84b14f - which was the reason for a diff between stable10 and master in package.json postinstall line.

I missed cherry-pick of these to master in PRs #34794 and #34796

And dbe9373 gets package.json in master closer to stable10

@codecov
Copy link

codecov bot commented Mar 20, 2019

Codecov Report

Merging #34841 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #34841   +/-   ##
=========================================
  Coverage     65.34%   65.34%           
  Complexity    18478    18478           
=========================================
  Files          1208     1208           
  Lines         69943    69943           
  Branches       1280     1280           
=========================================
  Hits          45707    45707           
  Misses        23864    23864           
  Partials        372      372
Flag Coverage Δ Complexity Δ
#javascript 53.04% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.76% <ø> (ø) 18478 <ø> (ø) ⬇️

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 30baf05...10d03d5. Read the comment docs.

@codecov
Copy link

codecov bot commented Mar 20, 2019

Codecov Report

Merging #34841 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #34841      +/-   ##
============================================
+ Coverage     65.34%   65.35%   +<.01%     
- Complexity    18478    18484       +6     
============================================
  Files          1208     1208              
  Lines         69943    69969      +26     
  Branches       1280     1280              
============================================
+ Hits          45707    45727      +20     
- Misses        23864    23870       +6     
  Partials        372      372
Flag Coverage Δ Complexity Δ
#javascript 53.04% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.76% <ø> (ø) 18484 <ø> (+6) ⬆️
Impacted Files Coverage Δ Complexity Δ
...ilesharing/templates/settings-personal-sharing.php 20% <0%> (-46.67%) 0% <0%> (ø)
apps/files_sharing/templates/settings-personal.php 20% <0%> (-46.67%) 0% <0%> (ø)
...iles_sharing/lib/Panels/Personal/PersonalPanel.php 100% <0%> (ø) 6% <0%> (+2%) ⬆️
...tedfilesharing/lib/Panels/SharingPersonalPanel.php 100% <0%> (ø) 6% <0%> (+2%) ⬆️
...es_sharing/lib/Controller/Share20OcsController.php 85.39% <0%> (+0.05%) 194% <0%> (+1%) ⬆️
...ederatedfilesharing/lib/FederatedShareProvider.php 61.13% <0%> (+0.17%) 85% <0%> (+1%) ⬆️

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 30baf05...a7f2864. Read the comment docs.

@@ -57,6 +57,6 @@
},
"scripts": {
"clean-modules": "modclean -r --patterns=\"default:safe,owncloud:basic\"",
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), '../core/vendor', 'junction') } catch (e) { }\""
"postinstall": "modclean -r --patterns=\"default:safe\" && node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), '../core/vendor', 'junction') } catch (e) { }\""
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@individual-it I updated the description to point to another commit in #34784
There is so much of this dependency stuff that was done slightly different ways and orders in master and stable10!

@phil-davis phil-davis merged commit bbb4f73 into master Mar 20, 2019
@delete-merged-branch delete-merged-branch bot deleted the keep-build-folder-patterns.json branch March 20, 2019 10:23
@lock lock bot locked as resolved and limited conversation to collaborators Mar 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants