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

Move install to php53 branch if running an unsupported version of PHP #8042

Merged
merged 6 commits into from Jan 10, 2018

Conversation

Projects
None yet
3 participants
@murrant
Member

murrant commented Jan 7, 2018

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

murrant added some commits Dec 27, 2017

Move PHP version check after update check. This will prevent us from …
…moving no update users to the php53 branch.

Hopefully if daily.php -f update fails it returns a non-zero and we can move them to the php53 branch still.
@murrant

This comment has been minimized.

Member

murrant commented Jan 8, 2018

Ok, I've tested this:

  • no updates
  • php 5.5 switch to php53
  • php 5.5 update in php53 branch
  • php 5.5 already updated in php53 branch
  • php 7.2 update switch to master
  • php 7.2 update in master branch
  • php 7.2 already updated in master branch
  • php 5.5 with php 5.5 incompatible code in init.php/daily.php

For the release version, I propose we create a new lightweight tag that way we can re-point the tag if we need to push an update. Otherwise it will be stuck on the hardcoded sha until PHP is updated.

I'm not sure how that will interact with the release tags, which updates to the newest commit I think.
https://git-scm.com/docs/git-rev-list#_commit_ordering

@murrant

This comment has been minimized.

Member

murrant commented Jan 8, 2018

We also need to decide a branch point for php53. Right now it is at 1.35.

@laf

This comment has been minimized.

Member

laf commented Jan 8, 2018

Can we not just move to a branch rather than a tag?

@murrant

This comment has been minimized.

Member

murrant commented Jan 9, 2018

I guess it would be the same thing effectively, no reason we need to use tags even if they are on the "release" train. Thanks for clearing that up @laf.

@murrant

This comment has been minimized.

Member

murrant commented Jan 9, 2018

Both release and master will end up in the same php53 branch. Seems good.

This is hard to test, but I have tested all the ones I could think of.

@scrutinizer-notifier

This comment has been minimized.

scrutinizer-notifier commented Jan 9, 2018

The inspection completed: 3 new issues

@laf laf merged commit d515f50 into librenms:master Jan 10, 2018

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@murrant

This comment has been minimized.

Member

murrant commented Jan 10, 2018

@murrant murrant deleted the murrant:php-version branch Jan 10, 2018

@lock

This comment has been minimized.

lock bot commented May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 16, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.