Skip to content

Commit 566f23a

Browse files
jeromy-cannonjeromy-cannon
committed
Squashed commit of the following:
commit e1cec23 Author: Jeromy Cannon <[email protected]> Date: Mon Apr 8 19:07:08 2024 +0100 update version Signed-off-by: Jeromy Cannon <[email protected]> commit 0f2c6a8 Author: Jeromy Cannon <[email protected]> Date: Sat Apr 6 07:42:30 2024 +0100 fixed bugs Signed-off-by: Jeromy Cannon <[email protected]> commit edadcb2 Merge: b45a8a3 dea5ea5 Author: Jeromy Cannon <[email protected]> Date: Fri Apr 5 16:52:19 2024 +0100 Merge branch 'main' into 00096-node-refresh commit b45a8a3 Author: Jeromy Cannon <[email protected]> Date: Fri Apr 5 16:49:51 2024 +0100 updates for addressing errors Signed-off-by: Jeromy Cannon <[email protected]> commit dea5ea5 Author: Hedera Eng Automation <[email protected]> Date: Fri Apr 5 15:43:04 2024 +0000 chore(release): 0.23.0 [skip ci] ## [0.23.0](v0.22.1...v0.23.0) (2024-04-05) ### Features * fix javascript documentation ([#193](#193)) ([f2476be](f2476be)) * remove helm & java install from ci pipeline ([#197](#197)) ([43bda68](43bda68)) ### Bug Fixes * solo relays command is not working ([#187](#187)) ([9ee6b46](9ee6b46)) commit fbcf7ca Author: JeffreyDallas <[email protected]> Date: Thu Apr 4 15:32:20 2024 -0500 ci: new github action workflow to generate static web pages using hugo (#200) Signed-off-by: Jeffrey Tang <[email protected]> commit 9129890 Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 18:59:07 2024 +0100 fix codacy complaint Signed-off-by: Jeromy Cannon <[email protected]> commit f801a0c Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 18:44:21 2024 +0100 add patched hedera version and fix code security issue Signed-off-by: Jeromy Cannon <[email protected]> commit 7d96536 Merge: 374e82e 2a66fe9 Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 16:54:11 2024 +0100 Merge branch 'main' into 00096-node-refresh commit 374e82e Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 16:53:38 2024 +0100 fix codestyle check Signed-off-by: Jeromy Cannon <[email protected]> commit a17ec56 Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 16:14:08 2024 +0100 update proxy times Signed-off-by: Jeromy Cannon <[email protected]> commit 75558c0 Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 15:42:23 2024 +0100 pretty Signed-off-by: Jeromy Cannon <[email protected]> commit c6cc393 Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 15:39:20 2024 +0100 todos Signed-off-by: Jeromy Cannon <[email protected]> commit b03268e Author: Jeromy Cannon <[email protected]> Date: Thu Apr 4 14:26:33 2024 +0100 made test cases DRY Signed-off-by: Jeromy Cannon <[email protected]> commit 9e30d0d Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 19:06:19 2024 +0100 prep for PR review Signed-off-by: Jeromy Cannon <[email protected]> commit 338423b Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 19:03:39 2024 +0100 cleanup TODOs Signed-off-by: Jeromy Cannon <[email protected]> commit a92305e Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 18:56:27 2024 +0100 remove dead code Signed-off-by: Jeromy Cannon <[email protected]> commit 969ecf3 Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 18:03:59 2024 +0100 remove TODOs Signed-off-by: Jeromy Cannon <[email protected]> commit f67edba Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 16:30:26 2024 +0100 use FST 0.24.1 Signed-off-by: Jeromy Cannon <[email protected]> commit 2cfabe0 Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 15:52:19 2024 +0100 remove unintentionally added files Signed-off-by: Jeromy Cannon <[email protected]> commit 3da67a3 Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 15:43:20 2024 +0100 working version with dump saved state Signed-off-by: Jeromy Cannon <[email protected]> commit 1dc4473 Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 13:06:45 2024 +0100 working version Signed-off-by: Jeromy Cannon <[email protected]> commit 713f3f0 Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 13:06:28 2024 +0100 working version Signed-off-by: Jeromy Cannon <[email protected]> commit 457478f Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 13:05:39 2024 +0100 todo and removed fst chart version override Signed-off-by: Jeromy Cannon <[email protected]> commit c051ee9 Author: Jeromy Cannon <[email protected]> Date: Wed Apr 3 13:04:20 2024 +0100 removed white noise in swirlds.log Signed-off-by: Jeromy Cannon <[email protected]> commit 2a66fe9 Author: JeffreyDallas <[email protected]> Date: Tue Apr 2 19:41:49 2024 -0500 test: add relay end to end test (#198) Signed-off-by: Jeffrey Tang <[email protected]> commit 43bda68 Author: JeffreyDallas <[email protected]> Date: Tue Apr 2 11:46:47 2024 -0500 feat: remove helm & java install from ci pipeline (#197) Signed-off-by: Jeffrey Tang <[email protected]> commit 8049e9c Author: Jeromy Cannon <[email protected]> Date: Mon Apr 1 18:42:38 2024 +0100 TODO for updating test-setup fst chart version Signed-off-by: Jeromy Cannon <[email protected]> commit 95c9c88 Author: Jeromy Cannon <[email protected]> Date: Mon Apr 1 17:43:55 2024 +0100 had to change network-nodeX services name Signed-off-by: Jeromy Cannon <[email protected]> commit 16e2ded Author: Jeromy Cannon <[email protected]> Date: Thu Mar 28 00:12:34 2024 +0000 pushing current code Signed-off-by: Jeromy Cannon <[email protected]> commit 0690cff Author: Jeromy Cannon <[email protected]> Date: Tue Mar 26 21:16:23 2024 +0000 draft of node refresh Signed-off-by: Jeromy Cannon <[email protected]> commit d5d53c5 Author: Jeromy Cannon <[email protected]> Date: Fri Mar 22 15:18:41 2024 +0000 in-progress Signed-off-by: Jeromy Cannon <[email protected]> Signed-off-by: Jeromy Cannon <[email protected]>
1 parent f2476be commit 566f23a

25 files changed

+865
-185
lines changed

‎.github/workflows/flow-hugo-publish.yaml

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
##
2+
# Copyright (C) 2023-2024 Hedera Hashgraph, LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
##
16+
17+
# Sample workflow for building and deploying a Hugo site to GitHub Pages
18+
name: Deploy Hugo site to Pages
19+
20+
on:
21+
# Runs on pushes targeting the default branch
22+
push:
23+
branches:
24+
- 00120-D-hugo-pipeline
25+
26+
# Allows you to run this workflow manually from the Actions tab
27+
workflow_dispatch:
28+
29+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
30+
permissions:
31+
contents: read
32+
pages: write
33+
id-token: write
34+
35+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
36+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
37+
concurrency:
38+
group: "pages"
39+
cancel-in-progress: false
40+
41+
# Default to bash
42+
defaults:
43+
run:
44+
shell: bash
45+
46+
jobs:
47+
# Build job
48+
build:
49+
runs-on: [self-hosted, Linux, medium, ephemeral]
50+
51+
steps:
52+
- name: Setup Hugo
53+
uses: peaceiris/actions-hugo@v2
54+
with:
55+
hugo-version: '0.124.1'
56+
57+
- name: Checkout Code
58+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
59+
with:
60+
fetch-depth: 0
61+
62+
- name: Setup Node
63+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
64+
with:
65+
node-version: 20
66+
67+
- name: Setup Pages
68+
id: pages
69+
uses: actions/configure-pages@v4
70+
with:
71+
enablement: true
72+
73+
- name: Install jsdoc
74+
run: |
75+
cd docs
76+
npm i -g jsdoc
77+
jsdoc --version
78+
jsdoc -c jsdoc.conf.json
79+
cd -
80+
81+
- name: Install jsdoc-to-markdown
82+
run: |
83+
cd docs
84+
npm i -g jsdoc-to-markdown
85+
jsdoc2md --version
86+
./generate_md.sh
87+
cd -
88+
89+
- name: Copy existing documentation
90+
run: |
91+
mkdir -p docs/content/Developer
92+
cp DEV.md docs/content/Developer/DEV.md
93+
mkdir -p docs/content/User
94+
cp README.md docs/content/User/README.md
95+
96+
- name: Build with Hugo
97+
env:
98+
# For maximum backward compatibility with Hugo modules
99+
HUGO_ENVIRONMENT: production
100+
HUGO_ENV: production
101+
run: |
102+
cd docs
103+
echo "base_url ${{ steps.pages.outputs.base_url }}"
104+
echo "origin ${{ steps.pages.outputs.origin }}"
105+
echo "host ${{ steps.pages.outputs.host }}"
106+
echo "base_path ${{ steps.pages.outputs.base_path }}"
107+
mkdir -p themes/hugo-geekdoc
108+
curl -L https://github.com/thegeeklab/hugo-geekdoc/releases/latest/download/hugo-geekdoc.tar.gz | tar -xz -C themes/hugo-geekdoc/ --strip-components=1
109+
ls -ltr
110+
hugo version
111+
hugo config
112+
hugo \
113+
--gc \
114+
--config hugo.toml \
115+
--minify \
116+
--baseURL "${{ steps.pages.outputs.base_url }}/"
117+
118+
- name: Upload artifact
119+
uses: actions/upload-pages-artifact@v3
120+
with:
121+
path: ./docs/public
122+
123+
# Deployment job
124+
deploy:
125+
environment:
126+
name: github-pages
127+
url: ${{ steps.deployment.outputs.page_url }}
128+
runs-on: [self-hosted, Linux, medium, ephemeral]
129+
needs: build
130+
steps:
131+
- name: Deploy to GitHub Pages
132+
id: deployment
133+
uses: actions/deploy-pages@v4

‎.github/workflows/zxc-compile-code.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ jobs:
7676
node-version: ${{ inputs.node-version }}
7777
cache: npm
7878

79-
- name: Setup Java
80-
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
81-
if: ${{ inputs.enable-e2e-tests && !cancelled() && !failure() }}
82-
with:
83-
distribution: temurin
84-
java-version: 21
85-
8679
- name: Setup Kind
8780
uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced # v1.9.0
8881
if: ${{ inputs.enable-e2e-tests && !cancelled() && !failure() }}
@@ -94,12 +87,6 @@ jobs:
9487
verbosity: 3
9588
wait: 120s
9689

97-
- name: Setup Helm
98-
uses: azure/setup-helm@29960d0f5f19214b88e1d9ba750a9914ab0f1a2f # v4.0.0
99-
if: ${{ (inputs.enable-unit-tests || inputs.enable-e2e-tests) && !cancelled() && !failure() }}
100-
with:
101-
version: "v3.12.3" # helm version
102-
10390
- name: Install Dependencies
10491
id: npm-deps
10592
run: npm ci

‎docs/data/menu/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
main:
3+
- name: User
4+
ref: "/User/README.md"
5+
- name: Developer
6+
ref: "/Developer/DEV.md"
7+
- name: Classes
8+
ref: "/solo/static/Classes/index.html"
9+
external: true

‎docs/data/menu/more.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#available icons: https://github.com/thegeeklab/hugo-geekdoc/tree/master/src/icons
2+
---
3+
more:
4+
- name: Hedera Hashgraph
5+
ref: "https://hedera.com/"
6+
external: true
7+
- name: "View Source"
8+
ref: "https://github.com/hashgraph/solo/issues"
9+
external: true
10+
icon: "gdoc_github"
11+

‎docs/generate_md.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
# find javascript files
4+
FIND_CMD=$(find ../src -name "*js")
5+
6+
# save result to array
7+
FILES=($FIND_CMD)
8+
9+
mkdir -p content/Classes
10+
11+
for i in "${FILES[@]}"
12+
do
13+
# echo $i
14+
# extract base file name from path, remove path and extension
15+
BASENAME=$(basename $i .js)
16+
jsdoc2md --no-cache -c jsdoc2md.conf.json $i > ./content/Classes/$BASENAME.md
17+
done

‎docs/hugo.toml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
baseURL = 'https://hashgraph.github.io/solo'
2+
languageCode = 'en-us'
3+
title = 'Solo Documentation'
4+
theme = "hugo-geekdoc"
5+
6+
# Geekdoc required configuration
7+
pygmentsUseClasses = true
8+
pygmentsCodeFences = true
9+
disablePathToLower = true
10+
11+
enableGitInfo = true
12+
13+
14+
# Required if you want to render robots.txt template
15+
enableRobotsTXT = true
16+
17+
# Needed for mermaid shortcodes
18+
[markup]
19+
[markup.goldmark.renderer]
20+
# Needed for mermaid shortcode
21+
unsafe = true
22+
[markup.tableOfContents]
23+
startLevel = 1
24+
endLevel = 9
25+
26+
[markup.highlight]
27+
style = "vs"
28+
29+
[taxonomies]
30+
tag = "tags"
31+
32+
[params]
33+
# (Optional, default false) Render menu from data file in 'data/menu/main.yaml'.
34+
# See also https://geekdocs.de/usage/menus/#bundle-menu.
35+
geekdocMenuBundle = true

‎docs/jsdoc.conf.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"source": {
3+
"include": [ "../src" ],
4+
"includePattern": ".+\\.(js(doc|x)?|mjs)$"
5+
},
6+
"sourceType": "module",
7+
"opts": {
8+
"recurse": true,
9+
"destination": "public/static/Classes"
10+
}
11+
}
12+

‎docs/jsdoc2md.conf.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"source": {
3+
"includePattern": ".+\\.(js(doc|x)?|mjs)$"
4+
},
5+
"sourceType": "module",
6+
"opts": {
7+
"recurse": true
8+
}
9+
}
10+

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hashgraph/solo",
3-
"version": "0.22.1",
3+
"version": "0.23.0",
44
"description": "An opinionated CLI tool to deploy and manage private Hedera Networks.",
55
"main": "src/index.mjs",
66
"type": "module",

0 commit comments

Comments
 (0)