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

Replace master branch by npm #64

Closed
10 tasks done
layik opened this issue Sep 15, 2021 · 9 comments
Closed
10 tasks done

Replace master branch by npm #64

layik opened this issue Sep 15, 2021 · 9 comments

Comments

@layik
Copy link
Collaborator

layik commented Sep 15, 2021

  • remove references to “the main repo” in eAtlas
  • check in with @layik re. unpublished commits on master
  • rename master -> old
  • delete old

Done/dropped:

  • make npm the default branch
  • delete build and start scripts from package.json
  • delete wip branch
  • #107
  • delete letsbeatcovid and covid19
  • rename npm to (e.g.) release and npm-dev to develop

This is mainly to keep using GH functionality such as automatic issue closing etc.

The npm development is the way forward. However, the original fork is useful for people who might want to use it the way the original work was done. Now is the time for a new master/main branch.

Imported from #96:

For clarification, the branch was the main dev repo for eAtlas/TGVE and has now grown out of its purpose.

  • master branch is now way behind branch npm
  • branch npm is the most important part, npm-dev is where I do work and create PRs on npm.
  • Wiki is the main docs for "the project"
  • Dockerfile is based on "old" approach of building the front-end using JS tools (npm)

Must be done:

  • README to serve as pointer to Wiki/docs and other repo docs etc
  • master branch => npm branch?
  • etc

Consider doing:

  • ??
@layik
Copy link
Collaborator Author

layik commented Jan 14, 2022

#92

@rolyp
Copy link
Contributor

rolyp commented Jan 14, 2022

Closing #92 as a duplicate of this. Importing comment from that issue by @layik:

Thanks @LydiaFrance and @rolyp.

One thing that is prevented/preventing me from making my mind up is tgve/eatlas-template and tgve/full-template in terms of what a master branch should look like. Say we rename this repo as tgvejs (i.e this repository becomes the "source of truth"), then we would either keep those repositories or move them into an "example" folder in the same tgvejs repo and possibly build those as the GH pages output.

If we do keep them, and so far I am inclined towards this, as they are now, then maybe I need to just propose to rename master as master-old and rename npm as master. The importance of those two repositories can be documented, if not already, with their reasons.

Any thoughts on this would be great for me. Thanks

@rolyp rolyp changed the title Replace/revamp master branch? Replace/revamp master branch Jan 14, 2022
@rolyp rolyp self-assigned this Jan 14, 2022
@rolyp
Copy link
Contributor

rolyp commented Jan 16, 2022

@layik Ah, there seem to be commits on master that haven't yet been published to npm, so things aren't straightforward. In particular README.md is quite different on the two branches. Need to discuss.

@layik
Copy link
Collaborator Author

layik commented Jan 16, 2022

Indeed!

@rolyp
Copy link
Contributor

rolyp commented Jan 16, 2022

@layik Btw, I will (occasionally) work weird hours, e.g. at weekends. Please ignore any comments that come your way during those unusual hours (unless you wish to respond, of course)!

@layik
Copy link
Collaborator Author

layik commented Jan 16, 2022

That makes two of us, glad you gave the warning first.

@rolyp rolyp added this to the Meeting 2022-01-20 milestone Jan 18, 2022
@rolyp rolyp changed the title Replace/revamp master branch Replace master branch by npm Jan 18, 2022
@rolyp rolyp changed the title Replace master branch by npm Replace master branch by npm Jan 18, 2022
layik added a commit that referenced this issue Jan 24, 2022
@layik layik closed this as completed Jan 24, 2022
@rolyp
Copy link
Contributor

rolyp commented Jan 24, 2022

@layik I'll reopen this until we're able to delete old.

@rolyp rolyp reopened this Jan 25, 2022
@layik
Copy link
Collaborator Author

layik commented Jan 31, 2022

OK, I have pushed "old" = "master" to private repo for backup only.

@layik layik closed this as completed Jan 31, 2022
@layik
Copy link
Collaborator Author

layik commented Jan 31, 2022

Can discuss my action above separately, branch is now deleted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants