Skip to content

Commit 38409d1

Browse files
alex-kuzmin-hgalex-kuzmin-hg
committed
Merge branch 'main' into latest_tested_solo-charts
2 parents a23795b + 64fbf95 commit 38409d1

35 files changed

+800
-504
lines changed

‎.github/workflows/flow-deploy-release-artifact.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
version: ${{ steps.tag.outputs.version }}
4646
steps:
4747
- name: Harden Runner
48-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
48+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4949
with:
5050
egress-policy: audit
5151

@@ -106,7 +106,7 @@ jobs:
106106
- update-readme
107107
steps:
108108
- name: Harden Runner
109-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
109+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
110110
with:
111111
egress-policy: audit
112112

‎.github/workflows/flow-gcs-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
storageType: ["gcs_only", "gcs_and_minio"]
3939
steps:
4040
- name: Harden Runner
41-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
41+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4242
with:
4343
egress-policy: audit
4444

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Harden Runner
66-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
66+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
6767
with:
6868
egress-policy: audit
6969

@@ -123,7 +123,7 @@ jobs:
123123
needs: Build
124124
steps:
125125
- name: Harden Runner
126-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
126+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
127127
with:
128128
egress-policy: audit
129129

‎.github/workflows/flow-pull-request-formatting.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: solo-linux-medium
4343
steps:
4444
- name: Harden Runner
45-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
45+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4646
with:
4747
egress-policy: audit
4848

‎.github/workflows/flow-task-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ permissions:
3636

3737
jobs:
3838
example-task-file-test:
39-
timeout-minutes: 20
39+
timeout-minutes: 30
4040
runs-on: solo-linux-large
4141
strategy:
4242
matrix:
4343
type: ["NO_ACCOUNT_INIT", "ACCOUNT_INIT"]
4444
steps:
4545
- name: Harden Runner
46-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
46+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
4747
with:
4848
egress-policy: audit
4949

‎.github/workflows/script/solo_smoke_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function setup_smart_contract_test ()
3131
rm -f .env
3232

3333
npm install
34-
npx hardhat compile || return 1:
34+
npx hardhat compile || return 1
3535

3636
echo "Build .env file"
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253
runs-on: solo-linux-medium
254254
steps:
255255
- name: Harden Runner
256-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
256+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
257257
with:
258258
egress-policy: audit
259259

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: solo-linux-medium
5353
steps:
5454
- name: Harden Runner
55-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
55+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
5656
with:
5757
egress-policy: audit
5858

‎.github/workflows/zxc-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
runs-on: solo-linux-large
7373
steps:
7474
- name: Harden Runner
75-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
75+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
7676
with:
7777
egress-policy: audit
7878

‎.github/workflows/zxc-env-vars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
e2e_relay_coverage_report: "E2E Relay Tests Coverage Report"
178178
steps:
179179
- name: Harden Runner
180-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
180+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
181181
with:
182182
egress-policy: audit
183183

‎.github/workflows/zxc-unit-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ${{ matrix.os }}
5959
steps:
6060
- name: Harden Runner
61-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
61+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
6262
with:
6363
egress-policy: audit
6464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: solo-linux-medium
6060
steps:
6161
- name: Harden Runner
62-
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
62+
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
6363
with:
6464
egress-policy: audit
6565

‎Taskfile.helper.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,12 +420,14 @@ tasks:
420420
deps:
421421
- task: "init"
422422
cmds:
423-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" -s ${SOLO_CLUSTER_SETUP_NAMESPACE} ${SOLO_CHARTS_DIR_FLAG} ${ENABLE_EXPLORER_TLS_FLAG} ${TLS_CLUSTER_ISSUER_TYPE_FLAG} ${MIRROR_NODE_DEPLOY_EXTRA_FLAGS} --pinger -q --dev
423+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" ${SOLO_CHARTS_DIR_FLAG} ${MIRROR_NODE_DEPLOY_EXTRA_FLAGS} --pinger -q --dev
424+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer deploy --namespace "${SOLO_NAMESPACE}" -s ${SOLO_CLUSTER_SETUP_NAMESPACE} ${SOLO_CHARTS_DIR_FLAG} ${ENABLE_EXPLORER_TLS_FLAG} ${TLS_CLUSTER_ISSUER_TYPE_FLAG} -q --dev
424425
- |
425426
if [[ "{{ .use_port_forwards }}" == "true" ]];then
426427
echo "Enable port forwarding for Hedera Explorer & Mirror Node Network"
427-
echo "Port forwarding for Hedera Explorer: http://localhost:6789"
428-
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" svc/hedera-explorer 8080:80 > /dev/null 2>&1 &"
428+
echo "Port forwarding for Hedera Explorer: http://localhost:8080"
429+
explorer_svc="$(kubectl get svc -l app.kubernetes.io/component=hedera-explorer -n ${SOLO_NAMESPACE} --output json | jq -r '.items[].metadata.name')"
430+
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" \"svc/${explorer_svc}\" 8080:80 > /dev/null 2>&1 &"
429431
echo "Port forwarding for Mirror Node Network: grpc:5600, rest:5551"
430432
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" svc/mirror-grpc 5600:5600 > /dev/null 2>&1 &"
431433
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" svc/mirror-rest 5551:80 > /dev/null 2>&1 &"
@@ -442,6 +444,7 @@ tasks:
442444
- task: "init"
443445
cmds:
444446
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node destroy --namespace "${SOLO_NAMESPACE}" --force -q --dev || true
447+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer destroy --namespace "${SOLO_NAMESPACE}" --force -q --dev || true
445448

446449
clean:
447450
desc: destroy, then remove cache directory, logs directory, config, and port forwards

0 commit comments

Comments
 (0)