Skip to content

Conversation

@zbeekman
Copy link
Collaborator

Pick up PR #103 in devel

EDIT: I spoke too soon...
EDIT 2: My first comment was correct, but a "protected branch" setting was causing Github to suggest "updating" the PR branch (in this case master) by merging the base branch (devel) into it, definitely not what we actually want to do... jeesh

Much simpler than merging devel into add-m4-to-dependency-tree and then add-m4-dependency-tree into devel. 💡

Git is also smart enough to know, since devel is based on master but we intentionally made changes like bumping the project version number to 2.0.0 etc. not to change that back to 1.2.3 etc. 🎉

I really need to address #29

Damian Rouson and others added 6 commits January 10, 2016 00:02
install.sh will now build m4 if any of each of the following is either not found has an insufficient version number: mpich->gfortran->flex->bison.
Reduced the installed gfortran version to the gcc 5 branch, effectively matching the script-installed version to the minimum version.
"./build gcc --default" now results in the download of a 5.3.0 release tar ball from the nearest mirror, instead of the previous svn checkout of the trunk (6.0.0). Any gcc build launched by install.sh now installs release 5.3.0. When invoking "build" by other means, e.g., at the command line, a development branch can be built by specifying the branch name (e.g., "./build gcc gcc-5-branch"). Not specifying a branch is equivalent to "./build gcc trunk".
The new install_prerequisites/check_version.sh script exits with an error status if the first argument names a package that returns a version number lower than the second version. Now install.sh calls check_version.sh to verify the cmake, flex, bison, and m4 versions, each of which reports version numbers in the format major.minor.patch at the end of the first line of output from invoking them with the sole argument "--version". TODO: handle version numbers in the major.minor format and then use check_version.sh to verify the version number returne dby "mpif90 -v". Currently install.sh instead uses "mpif90 --version" which returns the version number of the Fortran compiler that mpif90 wraps. No check on the version number of the MPI implementation itself is performed. See issue #104
@codecov-io
Copy link

Current coverage is 38.64%

Merging #105 into devel will not affect coverage as of d9b376d

@@ devel #105 diff @@ ===================================== Files 2 2 Stmts 885 885 Branches 0 0 Methods 0 ===================================== Hit 342 342 Partial 0 0 Missed 543 543 

Review entire Coverage Diff as of d9b376d


Uncovered Suggestions

  1. +1.92% via src/mpi/mpi_caf.c#2038...2054
  2. +1.58% via src/mpi/mpi_caf.c#2136...2149
  3. +1.58% via src/mpi/mpi_caf.c#1695...1708
  4. See 7 more...

Powered by Codecov. Updated on successful CI builds.

@zbeekman
Copy link
Collaborator Author

EDIT: I spoke too soon... I'll investigate on the command line, but please DO NOT MERGE yet...

@zbeekman
Copy link
Collaborator Author

OK, I think I found the source of the issue whereby Github was disallowing merging of master into devel because master was "outdated": I had designated devel as a protected branch (as is denoted by the shield/keyhole icon on the "branches" page) and had required even administrators to pass status checks. For some reason, in addition to the Travis-CI and CLA-assistant checks, Github tries to make sure that the merge is able to be a fast-forward merge (i.e. all changes being merged are applied starting from the "base" branch) even though merging PRs like this do not cause merge conflicts.

In essence, my first comment, which I had struck through but since reverted, was correct, but I had turned on a Github setting that I thought would help keep us out of trouble, that actually had the opposite effect.

@zbeekman
Copy link
Collaborator Author

Taking a look at the "files changed" tab displays the desired changes to be replayed on top of devel. This looks good to merge, to me, but I'll wait at least until tomorrow AM before doing so.

💥 :bowtie:

zbeekman added a commit that referenced this pull request Jan 12, 2016
Merge latest install logic including m4 dependency into `devel` branch
@zbeekman zbeekman merged commit 662b165 into devel Jan 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants