Skip to content

Update ruby 2.3.0 -> 2.5.3 #444

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

Closed
wants to merge 5 commits into from
Closed

Update ruby 2.3.0 -> 2.5.3 #444

wants to merge 5 commits into from

Conversation

viktorsmari
Copy link
Contributor

@viktorsmari viktorsmari commented Oct 18, 2018

If you first merge #443 , then this test should pass (if you force rerun it)

@enricostano
Copy link
Contributor

@viktorsmari #443 has been merged, thanks for your time!

Copy link
Collaborator

@markets markets left a comment

Choose a reason for hiding this comment

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

Hi @viktorsmari and thanks a lot for contributing! 👍

I just restarted the build via the Travis UI, but it failed again. I still see Ruby 2.3.0 ("rvm": "2.3.0") here: https://travis-ci.org/coopdevs/timeoverflow/jobs/443203668/config ...

¯_(ツ)_/¯ maybe a caching issue?

@viktorsmari
Copy link
Contributor Author

viktorsmari commented Oct 18, 2018

Of course, Travis only builds this PR, and the other PR #443 I made, even though it is already merged to develop, does not automatically 'join' this one.
I was afraid to 'break' this PR so I made another one just for testing #445
Do you know how can should correctly merge/rebase current develop branch into this PR?
Should I just do a git merge develop or git rebase develop and push it?

@markets
Copy link
Collaborator

markets commented Oct 18, 2018

does not automatically 'join' this one

ouch! yes of course 😅 I do not know why, I thought it was already rebased 🙏

About merge vs rebase. I prefer rebase when I'm working alone in a branch, but merge when working on a shared branching project/feature. Also, now that we have an squash button in GitHub, I sometimes squash all commits before merging directly via the UI... So no problem, both are fine, we do not have a policy on this subject either :)

Thanks!

@viktorsmari
Copy link
Contributor Author

I actually thought the same, that Travis would somehow know develop had changed!
But I pushed the rebased changes and Travis is building!

@enricostano
Copy link
Contributor

Hi @viktorsmari I still see some commit from others PRs, could you please check again? Thanks!

@viktorsmari
Copy link
Contributor Author

viktorsmari commented Oct 19, 2018

Hi @enricostano I just did what @markets asked me to do, to rebase this PR.
Can you tell me the correct way to do this? 🙉
I also did another copy of this PR, check #445 - maybe it is cleaner?

@enricostano
Copy link
Contributor

@viktorsmari did you sync your fork with latest changes upstream?

https://help.github.com/articles/syncing-a-fork/

Once you have the latest develop branch in your fork, go to this PR's branch and run git rebase develop. A forced push will be needed. I hope this will help you.

Many thanks for your time!

@viktorsmari
Copy link
Contributor Author

viktorsmari commented Oct 19, 2018

Thanks for your patience @enricostano 😄
It was the --force push that was missing, I am always afraid of using it 😆
I noticed they released a security update 2.3.8, 2 days ago, I am including it now, is that okay?

@viktorsmari viktorsmari changed the title Update ruby 2.3.0 -> 2.3.7 Update ruby 2.3.0 -> 2.3.8 Oct 19, 2018
Copy link
Contributor

@enricostano enricostano left a comment

Choose a reason for hiding this comment

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

Perfect, thanks!

@enricostano
Copy link
Contributor

Many thanks for your work on this @viktorsmari , I just want to inform you that this specific PR will be merged in a while. We're having some issues upgrading Ruby on the production machine and we're also planning to change the server in order to upgrade Ruby and more things.

So, don't worry if you see this PR not merged during some time, we still cannot say how long it will take. Sorry for the wait but keep the PRs coming! 😂 💪

@viktorsmari
Copy link
Contributor Author

viktorsmari commented Oct 19, 2018

What are we using in production? rvm or rbenv or other?
I have personally used rbenv in production with great results.
But recently at work I have moved to docker-compose for websites like https://fablabs.io and https://api.smartcitizen.me

I have just been testing newer ruby versions like 2.5.3 and all rake tests pass on that! So I could make another PR for newer versions.

@enricostano
Copy link
Contributor

Right now in production we're using an old server that uses a packaged version of Ruby, we don't like it and we will switch to rbenv. That's why in timeoverflow-provisioning repo the stage production is still missing.

As soon as we have more resources we'll be able to move forward with this plan at system administration level. I hope before the end of 2018, but it depends on many things.

@markets
Copy link
Collaborator

markets commented Oct 20, 2018

Hi @viktorsmari @enricostano, since we're going to take a while, I agree we'd upgrade to latest stable release 2.5.3 👌 I tested locally this version and everything seems to work fine.

@viktorsmari viktorsmari changed the title Update ruby 2.3.0 -> 2.3.8 Update ruby 2.3.0 -> 2.5.3 Oct 20, 2018
@enricostano
Copy link
Contributor

This PR has been superseded by #502

We're slooooowly moving forward updating our dependencies. I'm sorry this PR could not be merged before 😞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants