From b159837e22d321fc19e440cfbf9020ca1b16e7d1 Mon Sep 17 00:00:00 2001 From: Brian (bex) Exelbierd Date: Nov 05 2017 09:40:19 +0000 Subject: Redo orgchart to require generation as source Changes: 1. Remove the text diagram from project/orgchart.adoc and put it in project/orgchart.ditaa 2. save a generated png in project/images To generate a new diagram on Fedora dnf install -y ditaa ditaa project/orgchart.ditaa project/images/orgchart.png ---Justification--- Having ditaa as a build requirement is rather heavy and currently a non-starter in the CI system ... In the interim, and possibly forever, I'd like to see us make this a source requirement. --- diff --git a/project/images/orgchart.png b/project/images/orgchart.png new file mode 100644 index 0000000..751b2f2 Binary files /dev/null and b/project/images/orgchart.png differ diff --git a/project/orgchart.adoc b/project/orgchart.adoc index f6f9ff2..01895f9 100644 --- a/project/orgchart.adoc +++ b/project/orgchart.adoc @@ -4,8 +4,6 @@ How is Fedora Organized? This chart is a placeholder. Don't mistake it for an actual good way to make sense of things. - - [NOTE] ==== @@ -17,31 +15,4 @@ and the layout is terrible. ==== -[ditaa, "fedora-org-chart"] ----- - +-----------------------------------+ - | | +----------------+ - | Fedora Council | | | - | +---> Diversity | - +--+------------------------------+-+ | | - | | +----------------+ - | | - +---------------v-----+ +v-------------+ - | | +---------------+ | | +-------------+ - | Fedora Engineering | | | | Mindshare +----------> | - | Steering Committee +---> Globalization <---+ Committee | | More... | - | | | | | +--------+ | | - +-+-------+-----------+-+ +---------------+ ++--+-------+--+ | +-------------+ - | | | | | | | - | | | +-------v+ | +---v----+ +--v------------------+ - +-----------v+ v +-v------------+ | | | | Design | | Fedora Ambassadors | - | | +-+---------+ | | | Docs | | | & Web | | Steering Committee | - | Fedora | | | | Other Tech- | | | | | | | | - | Packaging | | Working | | Focused SIGs | +--------+ | +--------+ +-------------+-------+ - | Committee | | Groups | | and groups | | | - +------------+ | | +--------------+ +----------> +------------+ +-----v--------+ - +-----------+ | | | | | | - | CommOps | | Marketing | | Regions | - +----------+ | | | | - +------------+ +--------------+ ----- +image::orgchart.png[Fedora Organizational Chart] diff --git a/project/orgchart.ditaa b/project/orgchart.ditaa new file mode 100644 index 0000000..57c0316 --- /dev/null +++ b/project/orgchart.ditaa @@ -0,0 +1,25 @@ + +-----------------------------------+ + | | +----------------+ + | Fedora Council | | | + | +---> Diversity | + +--+------------------------------+-+ | | + | | +----------------+ + | | + +---------------v-----+ +v-------------+ + | | +---------------+ | | +-------------+ + | Fedora Engineering | | | | Mindshare +----------> | + | Steering Committee +---> Globalization <---+ Committee | | More... | + | | | | | +--------+ | | + +-+-------+-----------+-+ +---------------+ ++--+-------+--+ | +-------------+ + | | | | | | | + | | | +-------v+ | +---v----+ +--v------------------+ + +-----------v+ v +-v------------+ | | | | Design | | Fedora Ambassadors | + | | +-+---------+ | | | Docs | | | & Web | | Steering Committee | + | Fedora | | | | Other Tech- | | | | | | | | + | Packaging | | Working | | Focused SIGs | +--------+ | +--------+ +-------------+-------+ + | Committee | | Groups | | and groups | | | + +------------+ | | +--------------+ +----------> +------------+ +-----v--------+ + +-----------+ | | | | | | + | CommOps | | Marketing | | Regions | + +----------+ | | | | + +------------+ +--------------+