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

Add architectural diagram to main repository #128

Merged
merged 39 commits into from Jul 10, 2017
Merged

Conversation

RubenVerborgh
Copy link
Contributor

@RubenVerborgh RubenVerborgh commented Jun 26, 2017

This pull requests adds the source code to the architectural diagram to the main repository, together with the Travis code to build it.

Once merged to the master branch, the diagram will be compiled on every commit and placed into the gh-pages branch.

@RubenVerborgh
Copy link
Contributor Author

An admin of this repository (@lanthaler) should enable Travis here: https://travis-ci.org/profile/HydraCG


## Overview

![Latest diagram version](https://rubenverborgh.github.io/Hydra-Architecture-Diagram/hydra-architecture-diagram.svg)
Copy link
Member

Choose a reason for hiding this comment

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

This should probably be updated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, but first we need to make sure the CI works.

@lanthaler
Copy link
Member

Here's how the diagram currently looks like

Architecture Diagram

.travis.yml Outdated
before_install:
# Install LaTeX (for architecture diagram)
- sudo apt-get -qq update
- sudo apt-get install -y --no-install-recommends texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-extra-utils latex-xcolor pgf
Copy link
Member

Choose a reason for hiding this comment

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

Can't we use the Travis APT Addon to install dependencies declaratively instead of requiring sudo and doing it through a script?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, done in 8932d91.

# Checkout the gh-pages branch
REPO_PATH=$PWD
pushd $HOME
git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/$REPO_NAME gh-pages 2>&1 > /dev/null
Copy link
Member

Choose a reason for hiding this comment

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

Why not use the docs folder approach instead of the (imho) hacky gh-pages branch approach?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To not mess up the main branch. master only contains source; gh-pages contains compiled code.

I'd contest "hacky" BTW; this is a very reasonable approach used in several repositories.

Copy link
Member

Choose a reason for hiding this comment

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

What I mean about "hacky" is that this is a weird use of Git. But I agree that it might be a good idea to have compiled code away from master.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What I mean about "hacky" is that this is a weird use of Git.

Not really. GitHub decided to offer gh-pages as a branch whose contents are exposed through HTTP. So this script simply commits to that branch in order to publish a document over HTTP.

It's a well-known procedure and Travis even has a hook for it (which is slightly different than what I want).

Copy link
Member

Choose a reason for hiding this comment

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

I'm not questioning everyone's use of the gh-pages feature as it is an important functionality offered by GitHub. What I'm questioning is how the feature is implemented by GitHub, as I consider having a completely clean branch not related to any other branches in the same repository in any way whatsoever (source code management wise, which is what Git is for).

I think GitHub has implemented web site hosting as a hack and is also why I believe the new docs folder functionality has been added. Either way, this is way off topic and not something I feel is very important to agree on within this PR. Over some 🍻 sometime, perhaps? 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure 😄

@lanthaler
Copy link
Member

Merging this as agreed on today's telecon: http://www.hydra-cg.com/minutes/2017-07-10/#topic-3

@lanthaler lanthaler merged commit 82dc5ea into master Jul 10, 2017
@lanthaler lanthaler deleted the feature/diagram branch July 10, 2017 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants