Stream: svc
Topic: merging repos
Carl Leitner (Mar 13 2021 at 14:41):
hey @Giorgio Cangioli @Alexander Henket i want to plan on merging svc-rc1 back into the main repo svc. one of the reasons we had two branches was because of how we had the IG publisher github workflow configured which made it difficult to maintain several tagged/published versions under the gh-pages (e.g. one for RC1 and one for RC2). the workflow is changed now so that we can indicate branches to publish to gh-pages under refs/heads/{branch-name} based on a pull/commit event. note also the main branch will publish to the root of gh-pages on any commit.
if we pull this workflow into the svc repo, we can maintain rc1 and rc2 branches with corresponding directories under gh-pages.
some improvements yet to do on the workflow, but at least solves the problem of keeping multiple active copies.
Alexander Henket (Mar 13 2021 at 14:42):
I'm all for it. Is there a way to be useful before rc1 is released?
Carl Leitner (Mar 13 2021 at 14:45):
example:
test branch content is here https://who-int.github.io/svc-rc1/refs/heads/test/
and here https://github.com/who-int/svc-rc1/tree/gh-pages/refs/heads you can see the test and main branches
while the main (for public comment) is here https://who-int.github.io/svc-rc1
Carl Leitner (Mar 13 2021 at 14:46):
yes @Alexander Henket we need to figure out how/when to merge the svc and svc-rc1 repos.
Carl Leitner (Mar 13 2021 at 14:46):
a couple of things here.....
Carl Leitner (Mar 13 2021 at 14:50):
- figuring out the IPS dependency and tagging issues (BTW... also can try to branches and or tags under IPS w/ the github workflow if useful)
- we are trying to get an aligned framework for the IG content following L1-L4 knowledge representation layers so we need to get the svc repo aligned tt that. (flagging for @Bryn Rhodes as well - do we have a who-int template repo we should be using )
Carl Leitner (Mar 13 2021 at 14:55):
(cont)
For RC1
- decide on the model for the composition / bundle relationships to the paper SVC and immunization events and QR codes (need some diagrams to show this)
- need to determine land on how we model the QR code representation of the key content (want to ensure we can build some test/assertions off of these)
- build out some workflow diagrams (@Jose Costa Teixeira what do we need to do pull in the transaction and platuml stuff in?)
For RC2
- I need to pull in svc-rc2 content into a branch (currently private )
- for RC2 we need to decide if we want to do section[all vaccines] or section[all vaccines][covid vaccines] based on consent/selective disclosure use cases
Alexander Henket (Mar 13 2021 at 14:56):
A thing I forgot to ask yesterday: is svc-rc1 essentially a variation on Giorgios IG that Trudy and I commented on, or is that all your IG?
Carl Leitner (Mar 13 2021 at 15:03):
it was started clean. unfortunately, was under a time crunch and didn't have time to fully grok what was under svc to figure out was there. same deficit still exists.
Carl Leitner (Mar 13 2021 at 15:03):
also noticing that svc repo does not have fsh/ directory under input/ so maybe need to do some manual merging
Carl Leitner (Mar 13 2021 at 15:09):
Alexander Henket said:
A thing I forgot to ask yesterday: is svc-rc1 essentially a variation on Giorgios IG that Trudy and I commented on, or is that all your IG?
added @Trudy Hagg . is Gaby here?
Jose Costa Teixeira (Mar 13 2021 at 15:11):
Plantuml works out of the box.
Transactions we have to edit the plantuml and markdown, because that will still need to go through IG publisher changes.
Jose Costa Teixeira (Mar 13 2021 at 15:13):
this commit shows how to add aplantuml, the page that contains it, and the reference to the page in the ig.xml, as well as an optional menu item
https://github.com/costateixeira/devdays-covid19-vaccine/commit/a6a818f930960114457a19d33bfebdc869699003
Bryn Rhodes (Mar 13 2021 at 19:27):
@Carl Leitner , there is a template here: https://github.com/who-int/ig-template-who
Carl Leitner (Mar 14 2021 at 04:11):
Bryn Rhodes said:
Carl Leitner , there is a template here: https://github.com/who-int/ig-template-who
thanks! i was also thinking of having a template repo as in https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-template-repository which i guess is different then the repo template you put ;-)
the template repo would set up the input/fsh, input/pagecontent,etc. directory structure and put in the default L1-L4 toc/menu structure (but w/o the L1-L4 prefixes). this could help keep documentation styles consistent. seem worthwhile?
Bryn Rhodes (Mar 15 2021 at 13:09):
Yes, a template repository would be good, with all the base pages set up
Carl Leitner (Mar 15 2021 at 15:57):
rc1 and rc2 repo continuous builds are live at
https://who-int.github.io/svc-rc1/refs/heads/rc1/
https://who-int.github.io/svc-rc1/refs/heads/rc2/
main repo deploys to
https://who-int.github.io/svc-rc1/
Carl Leitner (Mar 15 2021 at 15:58):
(still working on putting stuff into rc2 branch)
Carl Leitner (Mar 16 2021 at 16:52):
@Giorgio Cangioli or @Alexander Henket when do you think we would have a tagged version of IPS w/ the relaxed constraints on demographics, etc.?
Giorgio Cangioli (Mar 16 2021 at 17:10):
Hi @Carl Leitner the intent is to have an STU update for the May Connectathon, if a tagged version is needed in advance let's work for this.
The later the better :-)
Carl Leitner (Mar 16 2021 at 17:13):
thanks. and understand the need for later for that. from the SVC side, we want to reference the IPS. it sounds like we can't do that for RC1, perhaps not for RC2 as well. that's ok, but for our main resource, that means we will need to repeat IPS Imm. constraints in SVC Imm.
Carl Leitner (Mar 16 2021 at 17:15):
the other thing we discussed was for the repos, we do want the svc repo to be the main one and we want to deprecate svc-rc1. given where we are with svc-rc1, it may be simplest to rename svc to svc-something-else and then rename svc-rc1 to svc.
Carl Leitner (Mar 16 2021 at 17:16):
(given where we are includes the gh-pages CI build, the strucutre/t.o.c., and partially the content)
Carl Leitner (Mar 16 2021 at 17:17):
I did see that there were a few more issues raised on the svc repo. is the intent to resolve them there and then pull them into svc-rc1?
Carl Leitner (Mar 16 2021 at 19:48):
Perhaps the best thing to do for now is to rename current svc to svc-ips and we use that for strict IPS requirements. this could/would eventually be merged into the current svc, once IPS dependencies are sorted, as part of rc2 or rc3.
Carl Leitner (Mar 16 2021 at 20:18):
for rc1 (which comes out Friday) i'll make sure that the composition here is aligned with resource https://github.com/who-int/svc/blob/main/fsh/profiles.fsh svc-rc1
Carl Leitner (Mar 18 2021 at 15:23):
hi all. repo's have been renamed. if you were working on svc, it is now svc-ips and you may need to do a:
git remote set-url origin git@github.com:who-int/svc-ips.git
or so. @Alexander Henket @Giorgio Cangioli
Last updated: Apr 12 2022 at 19:14 UTC