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

fix: kroki.io broken service prevents ci from passing #200

Merged
merged 81 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from 77 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
7b4e5b6
feat: add python linter
alicechaitea Feb 22, 2024
59e55e6
fix: combine RUN at line 10 after debugging
alicechaitea Feb 22, 2024
2492e67
fix: update Earthfile with example project
alicechaitea Feb 22, 2024
2f74af4
fix: fixes pillow (9.5.0) not supporting PEP 517 builds
alicechaitea Feb 22, 2024
cb508e2
fix: updates pillow to version 10.2.0
alicechaitea Feb 22, 2024
ec1d99e
fix: addresses pillow version outdated issue
alicechaitea Feb 22, 2024
4f0e82f
fix: updates pillow version
alicechaitea Feb 22, 2024
7219d95
Merge branch 'master' into feat/add-python-linter
stevenj Feb 22, 2024
b767697
fix downgrades pillow to 10.0.0
alicechaitea Feb 22, 2024
1a0d8ee
Merge branch 'feat/add-python-linter' of https://github.com/input-out…
alicechaitea Feb 22, 2024
db159f7
fix: downgrades pillow back to 9.5.0
alicechaitea Feb 22, 2024
5b81d2c
fix: downgrades pillow back to 9.5.0
alicechaitea Feb 22, 2024
b3cb040
test: pep517 error
alicechaitea Feb 22, 2024
e6bca0f
fix: adds zlib to Earthfile
alicechaitea Feb 22, 2024
335e56b
fix: adds the word FUNCTION to Earthfile
alicechaitea Feb 22, 2024
1ef0d1f
fix: addresses parser error
alicechaitea Feb 23, 2024
b826216
fix: address parser issue
alicechaitea Feb 23, 2024
f26d37a
fix: addresses parser error
alicechaitea Feb 23, 2024
c8a6ca3
fix: address parser issue
alicechaitea Feb 23, 2024
84332a8
fix: address parser issue
alicechaitea Feb 23, 2024
97f75f7
fix: address parser issue
alicechaitea Feb 23, 2024
eb8a45d
fix: address parser issue
alicechaitea Feb 23, 2024
2d1018f
fix: addresses directory issue
alicechaitea Feb 23, 2024
fa3b837
fix: adds image processing libraries
alicechaitea Feb 23, 2024
6697ff3
fix: adds image processing libraries
alicechaitea Feb 23, 2024
d037145
fix: adds image processing libraries
alicechaitea Feb 23, 2024
63e0a43
fix: updates depedendencies
alicechaitea Feb 23, 2024
1c4a022
fix: updates depedendencies
alicechaitea Feb 23, 2024
298fe85
fix: adds --no-root flag when installing poetry
alicechaitea Feb 23, 2024
a7f20a9
fix: changes python linter to ruff
alicechaitea Feb 23, 2024
454dd18
fix: adds git as dependency
alicechaitea Feb 23, 2024
c90df2f
fix: adds bash as dependency
alicechaitea Feb 23, 2024
27d5465
fix: deletes duplicate installation of dependency to prevent instabil…
alicechaitea Feb 23, 2024
99ca1e5
fix: amends Earthfile
alicechaitea Feb 23, 2024
c0ca14c
fix: changes FUNCTION to target
alicechaitea Feb 23, 2024
651d475
fix: enables execution on github actions
alicechaitea Feb 23, 2024
ab22174
fix: enables execution on github actions
alicechaitea Feb 23, 2024
0af0291
fix: removes virtual environment for python3
alicechaitea Feb 23, 2024
66fe448
fix: deletes poetry target
alicechaitea Feb 23, 2024
0c74996
Merge branch 'feat/add-python-linter' of https://github.com/input-out…
alicechaitea Feb 23, 2024
2a4488f
fix: restores changes
alicechaitea Feb 23, 2024
e34604b
test: rollbacks
alicechaitea Feb 23, 2024
9d0195c
fix: adds mkdocs
alicechaitea Feb 23, 2024
1a950b1
fix: restores Earthfiles
alicechaitea Feb 23, 2024
8f739d3
fix: restores Earthfile in examples
alicechaitea Feb 26, 2024
433d193
feat: adds target to linter
alicechaitea Feb 26, 2024
891321c
Merge branch 'master' into feat/add-python-linter
alicechaitea Feb 26, 2024
8e68144
fix: deletes .whl files at two locations
alicechaitea Feb 27, 2024
3aeedb2
fix: deletes poetry
alicechaitea Feb 27, 2024
4f22d7a
fix: deletes .toml and .lock from dir
alicechaitea Feb 28, 2024
102ce0f
fix: updates earthly files and adds std_checks.py
alicechaitea Feb 28, 2024
2497bc7
Merge branch 'master' into feat/add-python-linter
alicechaitea Feb 28, 2024
6179c9b
fix: deletes FORMAT and amends python-linter
alicechaitea Feb 29, 2024
2a6b5d9
fix: deletes FORMAT and addresses python-linter
alicechaitea Feb 29, 2024
98485de
Merge branch 'feat/add-python-linter' of https://github.com/input-out…
alicechaitea Feb 29, 2024
127f30d
fix: restores sql earthfile to earliest commit
alicechaitea Feb 29, 2024
a6355bf
fix: restores docs earthfile to earliest commit
alicechaitea Feb 29, 2024
f6b50e9
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
6684463
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
2699ddc
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
ef06493
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
946f3dd
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
df96533
fix: addresses /scripts not found
alicechaitea Feb 29, 2024
10d4888
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
25c3699
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
cae22ff
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
dbd5784
fix: addresses build.sh not found
alicechaitea Feb 29, 2024
3ade995
fix: adds build.sh to utilities/scripts/bash
alicechaitea Feb 29, 2024
00581a7
fix: deletes duplicate build.sh
alicechaitea Feb 29, 2024
1231e6f
fix: changes dir for build.sh
alicechaitea Feb 29, 2024
658149f
fix: adds dir for build.sh
alicechaitea Feb 29, 2024
1e0ce06
fix: deletes dir
alicechaitea Mar 1, 2024
a6ba221
docs(docs): Fix docs earthfiles
stevenj Mar 1, 2024
375b36a
fix(docs): Fix docs building issue
stevenj Mar 1, 2024
97c2626
Merge branch 'master' into fix/kroki-broken-with-graphviz
stevenj Mar 8, 2024
be1cfc3
fix(docs): Disable Kroki because its breaking CI
stevenj Mar 8, 2024
0dd2016
fix(rust): disable global cahce and see if it fixes ci build failure …
stevenj Mar 8, 2024
92a1135
fix(rust): change didn't help CI so revert it
stevenj Mar 8, 2024
95658f0
Update .config/dictionaries/project.dic
stevenj Mar 8, 2024
ba2bc84
fix(cspell): spelling correction
stevenj Mar 8, 2024
08611c0
Merge branch 'fix/kroki-broken-with-graphviz' of github.com:input-out…
stevenj Mar 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
aarch
buildkit
camelcase
codegen
colordiff
cowsay
cytopia
devenv
dind
dockerhub
doublecircle
Earthfile
Earthfiles
errchkjson
extldflags
fira
fmtchk
fmtfix
fontawesome
fontconfig
fontname
forcelabels
genpkey
ginkgolinter
gitops
Expand All @@ -29,57 +36,57 @@ GOMODCACHE
gopls
gosec
graphviz
grapviz
stevenj marked this conversation as resolved.
Show resolved Hide resolved
idents
jorm
jormungandr
Kroki
kubeconfig
ldflags
libgcc
lintfix
markdownlint
mattn
mdlint
mkdocs
modcache
mozallowfullscreen
multirepo
nextest
nilnil
nixos
nixpkgs
onsi
penwidth
pkeyopt
pkgs
projectcatalyst
pubout
pymdownx
PYTHONDONTWRITEBYTECODE
rankdir
rivo
runewidth
rustdoc
rustdocflags
rustflags
rustfmt
sqlfluff
subproject
subprojects
superfences
templating
testcov
testdocs
testpackage
testunit
Timoni
transpiling
UDCs
uniseg
voteplan
wasi
webkitallowfullscreen
WORKDIR
xerrors
zstd
idents
rustflags
rustdoc
rustdocflags
rustfmt
codegen
libgcc
lintfix
testunit
nextest
testcov
testdocs
fmtchk
fmtfix
wasi
6 changes: 6 additions & 0 deletions docs/src/appendix/examples/diagrams/invasion_plan.dot
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
digraph G {
rankdir=LR
Earth [peripheries=2]
Mars
Earth -> Mars
}
178 changes: 178 additions & 0 deletions docs/src/appendix/examples/graphviz-diagrams.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
---
icon: material/draw
---

# Graphviz Diagrams

## Graphviz SVG's

=== "Trees"
<!-- markdownlint-disable no-inline-html -->
<center>
<!-- markdownlint-enable no-inline-html -->

```dot
graph G {
size="1.8"
node [shape=circle, fontname="fira code", fontsize=28, penwidth=3]
edge [penwidth=3]
"-" -- {"x", "+"}
"x" -- 3 [weight=2]
"x" -- 5
"+" -- 2
"+" -- 4 [weight=2]
}
```

<figcaption><b>Tree 1: Tree of Arithmetic Expressions</b></figcaption>

```dot
graph G {
size="3"
forcelabels=true
node [shape=circle, fontname="fira code", fontsize=24, penwidth=3];
edge [penwidth=3]
5 -- {4, 32} [color=red]
31, 32 [label="3"]
21, 22, 23 [label="2"]
11, 12, 13, 14, 15 [label="1"]
01, 02, 03, 04, 05, 06, 07, 08 [label="0"]
4 -- 31 [color=blue, weight=2]
4 -- 22 [color=blue]
31 -- 21 [color=red, weight=3]
31 -- 12 [color=red]
32 -- 23 [color=blue]
32 -- 15 [color=blue, weight=2]
21 -- 11 [color=blue, weight=3]
21 -- 02 [color=blue]
11 -- 01 [color=red]
12 -- 03 [color=blue]
22 -- 13 [color=red]
22 -- 05 [color=red, weight=2]
13 -- 04 [color=blue]
23 -- {14, 07} [color=red]
14 -- 06 [color=blue]
15 -- 08 [color=red]
07, 08 [shape=doublecircle]
}
```

<figcaption><b>Tree 2: Game Tree (of Nim)</b></figcaption>

</center>

=== "Graphs"

<center>

```dot
graph G {
size="2";
bgcolor=none;
node [shape=circle, fontsize=30, style=bold];
edge [style=bold, fontsize=30]
4 -- 0
4 -- 0
4 -- 1
0 -- 2
0 -- 2
0 -- 2
2 -- 2
0 -- 3
1 -- 2
1 -- 3
1 -- 1
}
```

<figcaption>An Unweighted<br/>Undirected<br/>Multi-graph (with loops)</figcaption>

```dot
digraph G {
size="8"
node [shape=circle, fontsize=38]
edge [arrowhead=none]
subgraph cluster0 {
0 -> 1
2, 0, 3, 8, 11, 10 [color=blue, style=bold]
0 -> 2 [color=blue, style=bold]
0 -> 3 [color=blue, style=bold]
2 -> 3
8 -> 9
2 -> 9
8 -> 3 [color=blue, style=bold]
0 -> 4 -> 10
10 -> 11 [color=blue, style=bold]
8 -> 11 [color=blue, style=bold]
subgraph cluster00 {
1, 5, 6 [color=red, style=bold]
1 -> 5 [color=red, style=bold]
1 -> 6 [color=red, style=bold]
5 -> 6 [color=red, style=bold]
label="cycle"
fontcolor=red
fontsize=38
{rank = same; 5; 6;}
}
6 -> 7
2 -> 8
3 -> 9
label = "Related Component";
fontsize=38
{rank = same; 2; 3;}
{rank = same; 8; 9;}
}

subgraph cluster1 {
15 -> 16 -> 17
16 -> 18 -> 19
label="Related Component"
fontsize=38
}

subgraph cluster2 {
20 -> 21 -> 22
20 -> 23
21 -> 23
23 -> 24
label="Related Component"
fontsize=38
}
}
```

<figcaption>
Graph G Undirected Unweighted Unrelated
</figcaption>

## Graphviz inside Admonitions

???- note "graphviz in UnExpanded Block"

```dot
{{ include_file('src/appendix/examples/diagrams/invasion_plan.dot', indent=4) }}
```

???+ note "graphviz in Expanded Block"

```dot
{{ include_file('src/appendix/examples/diagrams/invasion_plan.dot', indent=4) }}
```

## Graphviz PNG's (lower quality than SVGs)

=== "Graphviz Render"

```graphviz dot attack_plan.png
{{ include_file('src/appendix/examples/diagrams/invasion_plan.dot', indent=4) }}
```

=== "Example of Code Syntax"

**SYNTAX (WATCHOUT) :** NO SPACES BETWEEN ` ``` ` and `graphviz`

~~~
``` graphviz dot attack_plan.png
{{ include_file('src/appendix/examples/diagrams/invasion_plan.dot', indent=4) }}
```
~~~
46 changes: 32 additions & 14 deletions docs/src/appendix/examples/kroki-diagrams.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,49 @@ icon: material/drawing-box

# Kroki Diagrams

**Kroki has proven unreliable in CI** therefore we no longer recommend its use.
It will be removed as soon as the last existing diagrams have a local renderer.
For diagrams that do not have a local renderer we will need to export them manually and
embed both the source and rendered image file inside the docs themselves.

<!-- cspell: words blockdiag -->

## Kroki Mermaid

* No Links
* Stand alone SVG

* Fails with 504 as at 8 March 2024

<!-- markdownlint-disable code-fence-style-->

~~~md
```kroki-mermaid theme=forest
flowchart LR
A[Start] --> B{Error?};
B -->|Yes| C[Hmm...];
C --> D[Debug];
D --> B;
B ---->|No| E[Yay!];
flowchart LR
A[Start] -> B{Error?};
B ->|Yes| C[Hmm...];
C -> D[Debug];
D -> B;
B ->|No| E[Yay!];
```
~~~
<!-- markdownlint-enable code-fence-style-->

## Other types

* Fails with 500 as at 8 March 2024

<!-- markdownlint-disable code-fence-style-->
~~~md
```kroki-blockdiag no-transparency=false size=1000x400
blockdiag {
blockdiag -> generates -> "block-diagrams";
blockdiag -> is -> "very easy!!";

blockdiag [color = "greenyellow"];
"block-diagrams" [color = "pink"];
"very easy!!" [color = "orange"];
}
blockdiag {
blockdiag -> generates -> "block-diagrams";
blockdiag -> is -> "very easy!!";

blockdiag [color = "greenyellow"];
"block-diagrams" [color = "pink"];
"very easy!!" [color = "orange"];
}
```
~~~
<!-- markdownlint-enable code-fence-style-->
8 changes: 7 additions & 1 deletion docs/src/reference/workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,16 @@ It then uses the custom `push` GitHub Action to re-tag the image and push it to
| Name | Type | Description | Required | Default |
| ---------------- | ------ | ---------------------------------------------------------------------------------- | -------- | ----------------------------------------------- |
| aws_ecr_registry | string | The AWS ECR registry that will be used to publish images | No | `""` |
| default_branch | string | The default branch of the repository. | No | `${{ github.event.repository.default_branch }}` |
| default_branch | string | The default branch of the repository. | No | `master` |
| tags | string | A line separated list of additional tags that will be applied to published images. | No | `""` |
| target | string | The target used to mark check builds | No | `publish` |

<!-- Note: `default_branch` `Default` column was defined as a mkdocs macro.
It had the value `github.event.repository.default_branch`
This breaks local builds of the documentation.
It has been hardcoded to `master` until a proper fix can be found.
-->

## Release

The release workflow is responsible for performing logic related to the `release` target.
Expand Down
Loading
Loading