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.

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

Consistency #10

Open
1 of 3 tasks
zlavergne opened this issue Jun 13, 2019 · 3 comments
Open
1 of 3 tasks

Consistency #10

zlavergne opened this issue Jun 13, 2019 · 3 comments
Assignees
Labels
question Further information is requested

Comments

@zlavergne
Copy link

zlavergne commented Jun 13, 2019

Let's standardize a few things:

  • File Names
  • versioning (major.minor.subversion) that can match release tags
  • gitflow :
  • master for releases only (with tags)
  • develop for PR's and merging into master
  • feature/hotfix branches (feature-ISSUE-NUMBER_NAME-OF-FEATURE or hotfix-ISSUE-NUMBER_NAME-OF-HOTFIX)

@taylorsmock I want to hear your feedback on this. I'd like to implement this on a smaller project like the validator so we can get used to it and move it the larger repos too.

@zlavergne zlavergne added the question Further information is requested label Jun 13, 2019
@tsmock
Copy link
Member

tsmock commented Jun 19, 2019

I had been intending to standardize filenames as kaart.<GROUP>.validator.mapcss. I just haven't done that yet, since I wanted to make certain I'd be around if something happened. I'd also have to get @andrewcp54 on board with the Dwarf validator. That shouldn't be too much of an issue, since I think they are here on a regular basis and don't have any (currently) scheduled vacations.

I'm absolutely OK with having a develop branch and a master branch. I haven't been doing any actual releases -- I'd want to set up some kind of CI first, to make certain things aren't broken. I would also want to add it to the list of mapcss validators in JOSM (so we don't have to copy-paste the URL).

Feature and hotfix branches should be OK. I prefer rebasing to merging though (I dislike merge commits), so I probably wouldn't be merging the hotfix branches.

I would also have to add to the README. I'd probably specify that develop may be regenerated at any time (merge to master, delete develop, create develop, have people wonder why develop is having issues).

@Rdclare75
Copy link
Contributor

Have we made any concrete decision on this?

@tsmock
Copy link
Member

tsmock commented Aug 14, 2019

File names should now be standardized.

I do want to add versioning back. I'll see if I can modify the script to get the number of revisions for each compiled file, and use that. Sometime. Version numbers are now automatically obtained with the make.py file, using the number of versions each release file has had along with today's date

I'm OK with feature and hotfix branches and maybe a development branch specific to each team (for testing), but I'd rather set up a bot to check for issues instead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question Further information is requested
Projects
None yet
Development

No branches or pull requests

3 participants