OpenMath / OMSTD

The OpenMath Standard (starting with OpenMath 2)
9 stars 5 forks source link

run script copies generated files to website when not in travis (and on a branch) #62

Closed kohlhase closed 6 years ago

kohlhase commented 6 years ago

I ran run on my alpha-conversion branch and got

[...]
zip
copying documents to ../OpenMath.github.io/standard/om20-editors-draft
Michaels-MBP-3:OMSTD kohlhase$ git branch
* alpha-conversion
  cdgroups
  master
  xref-href
Michaels-MBP-3:OMSTD kohlhase$ cd ../OpenMath.github.io/
Michaels-MBP-3:OpenMath.github.io kohlhase$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   standard/om20-editors-draft/omcdgroup2.dtd
    modified:   standard/om20-editors-draft/omcdgroup2.rnc
    modified:   standard/om20-editors-draft/omcdgroup2.rng
    modified:   standard/om20-editors-draft/omcdgroup2.xsd
    modified:   standard/om20-editors-draft/omstd20-diff.html
    modified:   standard/om20-editors-draft/omstd20-diff.pdf
    modified:   standard/om20-editors-draft/omstd20.html
    modified:   standard/om20-editors-draft/omstd20.pdf
    modified:   standard/om20-editors-draft/openmath2.dtd
    modified:   standard/om20-editors-draft/openmath2.rnc
    modified:   standard/om20-editors-draft/openmath2.rng
    modified:   standard/om20-editors-draft/openmath2.xsd

no changes added to commit (use "git add" and/or "git commit -a")
Michaels-MBP-3:OpenMath.github.io kohlhase$ 

This should not happen.

davidcarlisle commented 6 years ago

shouldn't it happen?, why not?

if travis is running it only copies and commits if running from master

if run locally and a sibling ../Openmath.github.io exists it always copies but never tries to commit.

I find that useful as you can check that the change that you intended to make in the branch shows up in the generated html.

just do git checkout -- standard and clean up the OpenMath,github.io repo even if you run locally from the master branch you usually have to do checkout --standard to clean up as you will get differences in build date etc which will leave local copies blocking a git pull.

On 7 October 2017 at 17:54, Michael Kohlhase notifications@github.com wrote:

Assigned #62 https://github.com/OpenMath/OMSTD/issues/62 to @davidcarlisle https://github.com/davidcarlisle.

— You are receiving this because you were assigned. Reply to this email directly, view it on GitHub https://github.com/OpenMath/OMSTD/issues/62#event-1282920814, or mute the thread https://github.com/notifications/unsubscribe-auth/ABNcAuQzdo8NBxvv3dhSD8E4ywDopBX3ks5sp6zVgaJpZM4Pxapr .

kohlhase commented 6 years ago

hmmm, it was unexpected to me, therefore I thought it may have been an oversight :-). I always look at the local version under build to see the changes I am making. That feels safer to me. But I can work with your version as well. Feel free to close.

davidcarlisle commented 6 years ago

well... it was intentional to copy but actually It predates the travis setup so done with the intention that you'd push from the local copy. I may make it not copy by default. leave it open for a bit I may come back to this...

On 7 October 2017 at 18:37, Michael Kohlhase notifications@github.com wrote:

hmmm, it was unexpected to me, therefore I thought it may have been an oversight :-). I always look at the local version under build to see the changes I am making. That feels safer to me. But I can work with your version as well. Feel free to close.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/OpenMath/OMSTD/issues/62#issuecomment-334952884, or mute the thread https://github.com/notifications/unsubscribe-auth/ABNcArSVzeSv8P6mU3D1DDM38HrENpGtks5sp7bfgaJpZM4Pxapr .