Skip to content
This repository was archived by the owner on Apr 16, 2024. It is now read-only.

Fix apidoc syntax #738

Merged
merged 13 commits into from
May 14, 2018
Merged

Fix apidoc syntax #738

merged 13 commits into from
May 14, 2018

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented May 13, 2018

Description:

Closes #737

Improvements

  • Apidoc generation fixed
  • Generate Apidoc with travis and fail when syntax error

@coveralls
Copy link

coveralls commented May 13, 2018

Coverage Status

Coverage remained the same at 65.608% when pulling 2c77b01 on bugfix/737-fix-apidoc into e34aa05 on develop.

@kesselb kesselb mentioned this pull request May 13, 2018
.travis.yml Outdated
@@ -72,6 +72,7 @@ script:
- cd api
- sed -i 's/$TRAVIS_COMMIT/'$TRAVIS_COMMIT'/' src/server.ts
- npm run test # run backend test
- npm run apidoc # generate apidoc
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a bad idea, I wrote a better script for it!

@PatrickSkowronek
Copy link
Collaborator

@danielkesselberg what do you think about the script?

@kesselb
Copy link
Contributor Author

kesselb commented May 14, 2018

@PatrickSkowronek looks fine. I added chmod +x and remove fi before elif/else. We may change the name to keep up with the other scripts (- instead of _). I would try to merge if/elif block like below but this only works for bash and is not portable:

if [[ "$TRAVIS_PULL_REQUEST" != "false" && ( "$TRAVIS_BRANCH" == "develop" || "$TRAVIS_BRANCH" == "master" ) ]]; then

@kesselb
Copy link
Contributor Author

kesselb commented May 14, 2018

Looks good.

@PatrickSkowronek PatrickSkowronek merged commit ac3b2ee into develop May 14, 2018
@kesselb kesselb deleted the bugfix/737-fix-apidoc branch May 14, 2018 10:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apidoc broken
3 participants