Simpler build scripts #1964
Merged
Simpler build scripts #1964
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Write to /var/log/proxysql.log by default, and add a logrotate script which manages this path. Unfortunately, the logrotate script can't use `PROXYSQL FLUSH LOGS;` to tell ProxySQL to rotate file handles*, so we use copytruncate instead. It would be nice if ProxySQL could rotate file handles following a signal in future... * For two reasons: 1. There's no safe / standard way to find admin credentials 2. mysql(1) client may not be installed
This adds an error message to `make install/uninstall` on "unsupported" distros. The behaviour is the same as before (do nothing, successfully).
The build scripts for all three packaging targets are identical except for their Make targets. Unify them, and pass in a new environment variable PROXYSQL_BUILD_TYPE to define the build type we want. The build scripts are updated to automatically exit if any command fails (`set -e`), so the "&& \" pattern is no longer required. We also `set -u` to protect against any variable being accidentally unset.
We don't need the `&& \` pattern any more now that `set -e` is defined at the top of the script. Also apply several defensive fixes suggested by the Shellcheck linter (https://github.com/koalaman/shellcheck).
|
Also, I based this on top of #1963, so it includes that change |
|
Automated message: PR pending admin approval for build testing |
|
This is really great @alexjurkiewicz thank you very much! It was on the todo list :) and it really does simplify making changes, I'm going to merge it into 2.0.3 and build the new release with the upgraded scripts. |
|
There is an issue with the script @alexjurkiewicz centos67_build_1 | /opt/entrypoint/entrypoint.bash: line 25: build_target[@]: unbound variable |
pondix
pushed a commit
that referenced
this pull request
Mar 20, 2019
|
Sorry! I built the latest rhel/Deb scripts to test. I will investigate today. |
|
No problem, please make a PR against 2.0.4 since 2.0.3 is now released :) thanks again @alexjurkiewicz for your contribution! |
|
What branch name should I use? There isn't a v2.0.4 branch |
|
hi @alexjurkiewicz - I've pushed branch + tag for 2.0.4 |
pondix
pushed a commit
that referenced
this pull request
Mar 26, 2019
The build scripts for all three packaging targets are identical except for their Make targets. Unify them, and pass in a new environment variable PROXYSQL_BUILD_TYPE to define the build type we want. The build scripts are updated to automatically exit if any command fails (`set -e`), so the "&& \" pattern is no longer required. We also `set -u` to protect against any variable being accidentally unset. We don't need the `&& \` pattern any more now that `set -e` is defined at the top of the script. Also apply several defensive fixes suggested by the Shellcheck linter (https://github.com/koalaman/shellcheck). Other small changes: * fix: Add missing directory to deb script cleanup * fix: cosmetics * fix: Don't define config file twice in RPM spec
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a pretty invasive change to the build system, but I didn't see a good way to split it up.
There are two major improvements:
There are also a few minor fixes I found along the way:
make installandmake uninstallon unsupported OS (eg macOS)