Skip to content

Commit 76a61e3

Browse files
jeromy-cannonjeromy-cannon
authored
feat: removed caching of ConfigManager and its flags (#713)
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent 8d218c1 commit 76a61e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+482
-758
lines changed

‎.github/workflows/autogen/src/index.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function main () {
5454
const templateDir = path.join(outputDir, 'templates')
5555
const configFile = path.join(templateDir, 'config.yaml')
5656
const configData = fs.readFileSync(configFile, 'utf8')
57-
const config = /** @type {Config} **/ yaml.load(configData)
57+
const config = /** @type {Config} **/ yaml.load(configData, {})
5858

5959
// generate the workflows with changes
6060
buildWorkflows(outputDir, templateDir, config)

‎.github/workflows/script/update_md.sh

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/bin/bash
2+
set -xeo pipefail
3+
export SOLO_CLUSTER_NAME=solo
4+
export SOLO_NAMESPACE=solo
5+
export SOLO_CLUSTER_SETUP_NAMESPACE=solo-cluster
6+
7+
echo "Perform the following kind and solo commands and save output to environment variables"
8+
9+
kind create cluster -n "${SOLO_CLUSTER_NAME}" 2>&1 | tee create-cluster.log
10+
export KIND_CREATE_CLUSTER_OUTPUT=$( cat create-cluster.log | tee test.log )
11+
12+
solo init | tee init.log
13+
export SOLO_INIT_OUTPUT=$( cat init.log | tee test.log )
14+
15+
solo node keys --gossip-keys --tls-keys -i node1,node2,node3 | tee keys.log
16+
export SOLO_NODE_KEY_PEM_OUTPUT=$( cat keys.log | tee test.log )
17+
18+
solo cluster setup -s "${SOLO_CLUSTER_SETUP_NAMESPACE}" | tee cluster-setup.log
19+
export SOLO_CLUSTER_SETUP_OUTPUT=$( cat cluster-setup.log | tee test.log )
20+
21+
solo network deploy -i node1,node2,node3 -n "${SOLO_NAMESPACE}" | tee network-deploy.log
22+
export SOLO_NETWORK_DEPLOY_OUTPUT=$( cat network-deploy.log | tee test.log )
23+
24+
solo node setup -i node1,node2,node3 -n "${SOLO_NAMESPACE}" | tee node-setup.log
25+
export SOLO_NODE_SETUP_OUTPUT=$( cat node-setup.log | tee test.log )
26+
27+
solo node start -i node1,node2,node3 -n "${SOLO_NAMESPACE}" | tee node-start.log
28+
export SOLO_NODE_START_OUTPUT=$( cat node-start.log | tee test.log )
29+
30+
solo mirror-node deploy -n "${SOLO_NAMESPACE}" | tee mirror-node-deploy.log
31+
export SOLO_MIRROR_NODE_DEPLOY_OUTPUT=$( cat mirror-node-deploy.log | tee test.log )
32+
33+
solo relay deploy -i node1 -n "${SOLO_NAMESPACE}" | tee relay-deploy.log
34+
export SOLO_RELAY_DEPLOY_OUTPUT=$( cat relay-deploy.log | tee test.log )
35+
36+
echo "Generate README.md"
37+
38+
envsubst '$KIND_CREATE_CLUSTER_OUTPUT,$SOLO_INIT_OUTPUT,$SOLO_NODE_KEY_PEM_OUTPUT,$SOLO_CLUSTER_SETUP_OUTPUT, \
39+
$SOLO_NETWORK_DEPLOY_OUTPUT,$SOLO_NODE_SETUP_OUTPUT,$SOLO_NODE_START_OUTPUT,$SOLO_MIRROR_NODE_DEPLOY_OUTPUT,\
40+
$SOLO_RELAY_DEPLOY_OUTPUT'\
41+
< README.md.template > README.md
42+
43+
echo "Remove color codes and lines showing intermediate progress"
44+
45+
sed -i 's/\[32m//g' README.md
46+
sed -i 's/\[33m//g' README.md
47+
sed -i 's/\[39m//g' README.md
48+
egrep -v '↓|❯|•' README.md > README.md.tmp && mv README.md.tmp README.md
49+
set +x

‎.github/workflows/zxc-update-readme.yaml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -110,55 +110,17 @@ jobs:
110110
111111
- name: Update README.md
112112
run: |
113-
set -x
113+
set -xeo pipefail
114114
npm install
115115
npm run build
116116
npm install -g @hashgraph/solo
117117
npm link
118-
119118
echo "VERSION=${{ inputs.version }}"
120119
[[ -n "${{ inputs.version }}" ]] && npm version ${{ inputs.version }} -f --no-git-tag-version
121120
which solo
122-
123-
export SOLO_CLUSTER_NAME=solo
124-
export SOLO_NAMESPACE=solo
125-
export SOLO_CLUSTER_SETUP_NAMESPACE=solo-cluster
126-
127-
echo "Perform the following kind and solo commands and save output to environment variables"
128-
129-
export KIND_CREATE_CLUSTER_OUTPUT=$( kind create cluster -n "${SOLO_CLUSTER_NAME}" 2>&1 | tee test.log )
130-
131-
export SOLO_INIT_OUTPUT=$( solo init -i node1,node2,node3 -n "${SOLO_NAMESPACE}" -s \
132-
"${SOLO_CLUSTER_SETUP_NAMESPACE}" | tee test.log )
133-
134-
export SOLO_NODE_KEY_PEM_OUTPUT=$( solo node keys --gossip-keys --tls-keys | tee test.log )
135-
136-
export SOLO_CLUSTER_SETUP_OUTPUT=$( solo cluster setup | tee test.log )
137-
138-
export SOLO_NETWORK_DEPLOY_OUTPUT=$( solo network deploy | tee test.log )
139-
140-
export SOLO_NODE_SETUP_OUTPUT=$( solo node setup | tee test.log )
141-
142-
export SOLO_NODE_START_OUTPUT=$( solo node start | tee test.log )
143-
144-
export SOLO_MIRROR_NODE_DEPLOY_OUTPUT=$( solo mirror-node deploy | tee test.log )
145-
146-
export SOLO_RELAY_DEPLAY_OUTPUT=$( solo relay deploy -i node1,node2 | tee test.log )
147-
148-
export SOLO_RELAY_DEPLOY_OUTPUT=$( solo relay deploy | tee test.log )
149-
echo "Generate README.md"
150-
151-
envsubst '$KIND_CREATE_CLUSTER_OUTPUT,$SOLO_INIT_OUTPUT,$SOLO_NODE_KEY_PEM_OUTPUT,$SOLO_CLUSTER_SETUP_OUTPUT, \
152-
$SOLO_NETWORK_DEPLOY_OUTPUT,$SOLO_NODE_SETUP_OUTPUT,$SOLO_NODE_START_OUTPUT,$SOLO_MIRROR_NODE_DEPLOY_OUTPUT,\
153-
$SOLO_RELAY_DEPLAY_OUTPUT,$SOLO_RELAY_DEPLOY_OUTPUT'\
154-
< README.md.template > README.md
155-
156-
echo "Remove color codes and lines showing intermediate progress"
157-
158-
sed -i 's/\[32m//g' README.md
159-
sed -i 's/\[33m//g' README.md
160-
sed -i 's/\[39m//g' README.md
161-
egrep -v '↓|❯|•' README.md > README.md.tmp && mv README.md.tmp README.md
121+
node -p -e "Boolean(process.stdout.isTTY)"
122+
chmod 755 ./.github/workflows/script/update_md.sh
123+
./.github/workflows/script/update_md.sh </dev/null | cat
162124
set +x
163125
164126
- name: Check README.md Changes

‎.gitignore

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
hs_err_pid*
2929
replay_pid*
3030

31-
### NotepadPP template
32-
# Notepad++ backups #
33-
*.bak
34-
3531
### VisualStudioCode template
3632
.vscode/*
3733
!.vscode/settings.json
@@ -121,11 +117,9 @@ local.properties
121117
#.project
122118

123119
### Backup template
124-
*.bak
125120
*.gho
126121
*.ori
127122
*.orig
128-
*.tmp
129123

130124
### PuTTY template
131125
# Private key
@@ -157,32 +151,6 @@ $RECYCLE.BIN/
157151
# Windows shortcuts
158152
*.lnk
159153

160-
### Kotlin template
161-
# Compiled class file
162-
*.class
163-
164-
# Log file
165-
*.log
166-
167-
# BlueJ files
168-
*.ctxt
169-
170-
# Mobile Tools for Java (J2ME)
171-
.mtj.tmp/
172-
173-
# Package Files #
174-
*.jar
175-
*.war
176-
*.nar
177-
*.ear
178-
*.zip
179-
*.tar.gz
180-
*.rar
181-
182-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
183-
hs_err_pid*
184-
replay_pid*
185-
186154
### OpenSSL template
187155
# OpenSSL-related files best not committed
188156

@@ -252,9 +220,6 @@ bh_unicode_properties.cache
252220
# https://packagecontrol.io/packages/sublime-github
253221
GitHub.sublime-settings
254222

255-
### MicrosoftOffice template
256-
*.tmp
257-
258223
# Word temporary
259224
~$*.doc*
260225

@@ -424,7 +389,7 @@ Sessionx.vim
424389

425390
# Temporary
426391
.netrwhist
427-
*~
392+
428393
# Auto-generated tag files
429394
tags
430395
# Persistent undo
@@ -434,9 +399,6 @@ tags
434399
# It's better to unpack these files and commit the raw source because
435400
# git has its own built in compression methods.
436401
*.7z
437-
*.jar
438-
*.rar
439-
*.zip
440402
*.gz
441403
*.gzip
442404
*.tgz
@@ -445,7 +407,6 @@ tags
445407
*.bz2
446408
*.xz
447409
*.lzma
448-
*.cab
449410
*.xar
450411

451412
# Packing-only formats
@@ -459,13 +420,9 @@ tags
459420
*.egg
460421
*.deb
461422
*.rpm
462-
*.msi
463-
*.msm
464-
*.msp
465423
*.txz
466424

467425
### Patch template
468-
*.orig
469426
*.rej
470427

471428
### macOS template

0 commit comments

Comments
 (0)