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

Update Guzzle to 6.5 #598

Merged
merged 2 commits into from
Oct 21, 2021
Merged

Update Guzzle to 6.5 #598

merged 2 commits into from
Oct 21, 2021

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented May 19, 2021 •
edited
Loading

Update Guzzle library to 6.5 and get rid of Guzzle 5.3 with its unmaintained dependencies

@VicDeo VicDeo mentioned this pull request May 19, 2021
Closed
@VicDeo
Copy link
Member Author

VicDeo commented May 19, 2021

@phil-davis hm.. it is still referencing wrong line numbers in tests...

@phil-davis
Copy link
Contributor

@phil-davis hm.. it is still referencing wrong line numbers in tests...

I pushed a commit that might fix that. The drone CI is using starlark code that came from the other oC10 apps, but it had the apps folder under server removed at some point. That happened some time when we were getting drone CI going here. Somehow that does not work when there is an oC10 installed in server and then the PR code is in server/updater. I never found the exact reason. But it works when in server/apps/updater.

Actually, some day, I should try to remove all the installCore stuff from the drone CI. None of that should be needed for the updater CI. updater is an "independent" thing, not a true oC10 app.

@sonarcloud
Copy link

sonarcloud bot commented May 19, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@VicDeo
Copy link
Member Author

VicDeo commented May 19, 2021

@phil-davis Thanks for your help.

updater is an "independent" thing, not a true oC10 app.

exactly

@VicDeo VicDeo changed the title Update Guzzle to 6.5.5 Update Guzzle to 6.5 May 19, 2021
@VicDeo VicDeo mentioned this pull request Oct 21, 2021
Closed
@phil-davis phil-davis self-requested a review October 21, 2021 11:07
@phil-davis
Copy link
Contributor

I rebased and resolved conflicts. But now I am worried that I had an older version of this branch locally. I hope that I didn't break anything.

@phil-davis
Copy link
Contributor

phil-davis commented Oct 21, 2021 •
edited
Loading

This needs CI fixing first - see #628 - then it can be rebased again.

Edit: that has been merged, and I have rebased this PR. Let's see what CI thinks.

@VicDeo
Copy link
Member Author

VicDeo commented Oct 21, 2021 •
edited
Loading

I see no difference between 034c6c8 and
86fbd7d except some indentations
so I don't think anything essential was missed due to outdated local branch.

@phil-davis
Copy link
Contributor

I rebased, squashed 1 commit, with signing - hopefully this time it will not complain about an unsigned commit.

@sonarcloud
Copy link

sonarcloud bot commented Oct 21, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

20.0% 20.0% Coverage
0.0% 0.0% Duplication

@phil-davis
Copy link
Contributor

@VicDeo please merge if you are happy with this.

@VicDeo VicDeo merged commit 02ac41d into master Oct 21, 2021
@delete-merged-branch delete-merged-branch bot deleted the guzzle-update branch October 21, 2021 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phil-davis phil-davis phil-davis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@VicDeo @phil-davis