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

Update octicon version #1652

Merged
merged 17 commits into from
Sep 18, 2021
Merged

Update octicon version #1652

merged 17 commits into from
Sep 18, 2021

Conversation

ong6
Copy link
Contributor

@ong6 ong6 commented Aug 14, 2021

What is the purpose of this pull request?

  • Documentation update
  • Bug fix
  • Feature addition or enhancement
  • Code maintenance
  • Others, please explain:

Fixes #1639

Overview of changes:

  • Update octicon version to version 15.0.1

Anything you'd like to highlight / discuss:

Testing instructions:

Can test this by trying :octicon-file-diff: (which was not working previously)

Proposed commit message: (wrap lines at 72 characters)
Update octicon version


Checklist: ☑️

  • Updated the documentation for feature additions and enhancements
  • Added tests for bug fixes or features
  • Linked all related issues
  • No unrelated changes

lerna.json Outdated
@@ -2,5 +2,5 @@
"packages": [
"packages/*"
],
"version": "3.0.6"
"version": "3.0.7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe there is no need to increment the version no. We usually only do this during a new release. Same for the rest of the package.json.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonahtanjz how do we ensure that the version update happens at the next release? Is it automatic? If not, is it better to update the version number now itself? It might help to detect problems with new versions before the next release.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prof @damithc, based on the project management guide for doing a release, the version number will be incremented when running the lerna version --no-push command. From my understanding, I don't think we should be changing the version number when updating dependencies as this will affect a few things, such as test files etc, and also make it harder to track if for example another PR has incremented the number for another dependency update etc.

EDIT: We also need to know the changes that will be added to the next release so that we can increment the version accordingly (either patch, minor or major).

It might help to detect problems with new versions before the next release.

We should still be able to detect issues once the PR is merged to master without changing the version number.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Thanks for the explanation @jonahtanjz

@ong6 ong6 closed this Aug 19, 2021
This reverts commit 5659965.

:q
:wq

i
@ong6 ong6 reopened this Aug 29, 2021
@ong6
Copy link
Contributor Author

ong6 commented Aug 29, 2021

@jonahtanjz

Hi, I'm not sure why this CI is not working and I can't seem to replicate this on my local machine.

The steps I followed to test this:

  1. Run npm run setup
  2. Run npm run test

npm run test works fine on my end with no errors

Things I have done to troubleshoot this issue:

  1. Run npm run updatetest (does not work)
  2. Manually compare the file diff that was given in the error.
    • There was no file differences between them, everything was the same (even line endings)
  3. Added log outputs to test if there was any difference in the files. (looks the same to me)

@jonahtanjz
Copy link
Contributor

jonahtanjz commented Aug 29, 2021

Hi @ong6,

I was able to replicate the error on my local machine after pulling from your branch.

image

I ran npm run updatetest and it seems there is an additional rule, overflow: visible;, added to octicons.css in the expected test folders. I've opened a PR to the branch for your reference.

Not sure why this is not reflected on your local machine after running npm run updatetest 🤔

EDIT: You can try running npm run setup from your octicon-update branch and then npm run updatetest to see if the octicons.css has any changes. If that does not work perhaps you can try cloning the markbind repo and set it up again.

@ong6
Copy link
Contributor Author

ong6 commented Aug 29, 2021

Thanks for the help @jonahtanjz it worked after I reset the markbind repo and reset it!

@jonahtanjz
Copy link
Contributor

One minor nit, you can ignore the generated .png files from npm run updatetest. It is an open issue #1130 if you are interested :)

@jonahtanjz
Copy link
Contributor

Hi @ong6, just to check on this, able to ignore the .png files from npm run updatetest for this PR?

@ong6
Copy link
Contributor Author

ong6 commented Sep 14, 2021

@jonahtanjz Oops missed your previous message, will remove them now! Or did you mean just ignoring them in gitignore? I think I will create a new PR if that's the case, seems to be quite hard to revert this.

@jonahtanjz
Copy link
Contributor

Oops missed your previous message, will remove them now! Or did you mean just ignoring them in gitignore? I think I will create a new PR if that's the case, seems to be quite hard to revert this.

Ahh sorry might not have been clear 😅 I meant reverting only the .png files. Something like git checkout <Commit ID before the updatetest> -- packages/cli/test/functional/test_site/**/*.png. Note that if you change the test files of any related diagrams then you do not need to revert the respective generated images. In this case, since the test update did not modify any of the diagrams, then we should ignore the changes of the expected images generated. Hope this clears up 😄

@ong6
Copy link
Contributor Author

ong6 commented Sep 15, 2021

git checkout <Commit ID before the updatetest> -- packages/cli/test/functional/test_site/**/*.png

@jonahtanjz Wow! Didn't think it was so simple to ignore the changes, I guess you learn something new with git every day. Thanks for all the help!

.gitignore Outdated
@@ -46,6 +46,7 @@ packages/core/template/*/_site

# Generated site (MarkBind)
packages/cli/test/functional/*/_site
packages/cli/test/functional/test_site/expected/diagrams/*.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will still need to track the changes of the generated diagrams when there are updates to the test .puml files here (add/remove .puml files or simply updating the code in the .puml files etc).

What I meant earlier about "ignoring" the generated images is when there are no changes made to the original .puml test files before running updatetest. In this scenario, we should revert the changes made to the expected images generated after updatetest as the images should not have changed. Sorry for the confusion 😅

Just need to remove this line here and the rest is good 👍

Copy link
Contributor

@jonahtanjz jonahtanjz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@jonahtanjz jonahtanjz added this to the 3.0.7 milestone Sep 18, 2021
@jonahtanjz jonahtanjz merged commit 306fb05 into MarkBind:master Sep 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update octicon version
3 participants