You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/05/01 01:39:15 UTC

[GitHub] ccollins476ad opened a new pull request #165: Allow git commit strings in `project.yml`

ccollins476ad opened a new pull request #165: Allow git commit strings in `project.yml`
URL: https://github.com/apache/mynewt-newt/pull/165
 
 
   This fixes issue #157.  Please refer to the issue for a description of the problem.
   
   The `project.yml` file contains a set of repository descriptors, each starting with `repository.`.  Each descriptor contains a `vers` field, indicating the version of the repo that the project depends on.  Prior to this commit, the `vers` field had to contain one of the following forms:
   
       * [Normalized version]: #.#.#
           (e.g., "1.3.0")
   
       * [Floating version]:   #[.#]-<stability
           (e.g., "0-dev")
   
   This PR adds support for a third form:
   
       * [Git commit]:         <git-commit-ish>-commit
           (e.g., "0aae710654b48d9a84d54de771cc18427709df7d-commit")
   
   I added a summary of how this feature works at the top of `newt/install/install.go`.  To get the most out of this feature, we will want to add a `version.yml` file to each repo.  This file would be maintained as follows:
   
   *master branch:*
   ```
   repo.version: 0.0.0
   ```
   
   *release branches:*
   ```
   repo.version: <repo-version>
   ```
   
   So, if this feature gets merged, we would want to do the following to `apache-mynewt-core`:
   1. Add to `master`: `repo.version` containing `0.0.0`.
   2. Add to `1_4_0_dev`: `repo.version` containing `1.4.0`.
   
   In addition, this PR removes the ability to "force update" and "force sync" (i.e., the `-f` switch no longer has any effect with these commands).  These "forced" forms of these commands didn't map well onto this new feature, and I personally found them to leave the repo in a more confusing state.  That said, I am not against adding them back if they are deemed useful.
   
   Finally, this might be an extremely painful review, so I apologize in advance.  This feature was way more involved than I originally anticipated, and by the time I was finished, there was just no reasonable way to break it up into several atomic commits.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services