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

build.sh rework #1008

Merged
merged 2 commits into from
Jul 10, 2018
Merged

build.sh rework #1008

merged 2 commits into from
Jul 10, 2018

Conversation

mcspr
Copy link
Collaborator

@mcspr mcspr commented Jun 29, 2018 •
edited
Loading

  • separate statements instead of inline logic
  • -DAPP_REVISION=... instead of modifying file (see accidental commit of version.h)
  • show revision in the log (git describe shows current tag or <tag>-<n-commits>-<sha1>)
  • set -e to avoid some issues when commands fail in build.sh but build succedes
  • check for git command presence, because with set -e it will fail without it. source.tar.gz downloaded from releases should still work

Requires #1007

@mcspr mcspr force-pushed the build-sh-rework branch 2 times, most recently from 8bc220b to 2279e05 Compare June 30, 2018 06:56
mcspr added 2 commits July 2, 2018 01:03
@mcspr
Separate test and release stages in travis
5fdf4aa 
- Revert test to being serial. Releases are using parallel jobs.
- Some cosmetic changes in build.sh
@mcspr
Build script rework
064080c
@mcspr mcspr force-pushed the build-sh-rework branch from 2279e05 to 064080c Compare July 1, 2018 22:08
@mcspr mcspr mentioned this pull request Jul 6, 2018
Merged
@xoseperez xoseperez merged commit c16b380 into xoseperez:dev Jul 10, 2018
mcspr added a commit to mcspr/espurna that referenced this pull request Jul 25, 2018
@mcspr
Fixup build.sh error handling from xoseperez#1008
5ec0339 
* Change git detection to not accidentaly exit the shell
* Fix [ $par_build ] always being true
* Fix git-describe with shallow clone ("No tags can describe ...")
mcspr added a commit to mcspr/espurna that referenced this pull request Jul 25, 2018
@mcspr
Fix up build.sh error handling from xoseperez#1008
13c051a 
* Change git detection to not accidentaly exit the shell
* Fix [ $par_build ] always being true
* Fix git-describe with shallow clone ("No tags can describe ...")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@mcspr @xoseperez