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.

Sign up for GitHub

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

ci: Fix issue with github_env echo statements #3012

Merged
merged 5 commits into from
Sep 19, 2024
Merged

ci: Fix issue with github_env echo statements #3012

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27c6e74
ci: Fix issue with github_env echo statements
rbarker-dev Sep 18, 2024
9f1c914
Updated how we pass operator_key to acceptance workflow
rbarker-dev Sep 18, 2024
d2158f0
Clean up title of Set Operator ID step
rbarker-dev Sep 18, 2024
b2230eb
Moved OPERATOR_ID_MAIN environment variable definition up to the job
rbarker-dev Sep 18, 2024
d80c7d5
Cleanup in conformity workflow
rbarker-dev Sep 18, 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
12 changes: 12 additions & 0 deletions .github/workflows/acceptance-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
testfilter: api_batch1
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

api_batch_2:
Expand All @@ -36,6 +37,7 @@ jobs:
testfilter: api_batch2
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

api_batch_3:
Expand All @@ -45,6 +47,7 @@ jobs:
testfilter: api_batch3
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

erc20:
Expand All @@ -54,6 +57,7 @@ jobs:
testfilter: erc20
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

ratelimiter:
Expand All @@ -63,6 +67,7 @@ jobs:
testfilter: ratelimiter
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

tokencreate:
Expand All @@ -72,6 +77,7 @@ jobs:
testfilter: tokencreate
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

tokenmanagement:
Expand All @@ -81,6 +87,7 @@ jobs:
testfilter: tokenmanagement
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

htsprecompilev1:
Expand All @@ -90,6 +97,7 @@ jobs:
testfilter: htsprecompilev1
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

precompilecalls:
Expand All @@ -99,6 +107,7 @@ jobs:
testfilter: precompile
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

websocket-batch-1:
Expand All @@ -109,6 +118,7 @@ jobs:
test_ws_server: true
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

websocket-batch-2:
Expand All @@ -119,6 +129,7 @@ jobs:
test_ws_server: true
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

websocket-batch-3:
Expand All @@ -129,6 +140,7 @@ jobs:
test_ws_server: true
envfile: ${{ inputs.network }}Acceptance.env
operator_id: ${{ inputs.operator_id }}
secrets:
operator_key: ${{ inputs.operator_key }}

publish_results:
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/acceptance-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ on:
operator_id:
required: false
type: string
operator_key:
required: false
type: string
networkTag:
required: false
type: string
Expand All @@ -29,6 +26,10 @@ on:
relayTag:
required: false
type: string
secrets:
operator_key:
description: 'The ED25519 or ECDSA DER encoded private key of the operator'
required: false

jobs:
acceptance-workflow:
Expand Down Expand Up @@ -69,14 +70,14 @@ jobs:
- name: Install hedera local
run: npm install @hashgraph/hedera-local -g

- name: Set operator id and key env variable if CI is manual
- name: Set operator id env variable if CI is manual
if: ${{ inputs.operator_id }}
run: |
echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV
echo "OPERATOR_KEY_MAIN=${{ inputs.operator_key }}" >> $GITHUB_ENV
run: echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV
rbarker-dev marked this conversation as resolved.
Show resolved Hide resolved

- name: Run hedera local
run: npx hedera restart -d --network-tag=${{inputs.networkTag}} --mirror-tag=${{inputs.mirrorTag}} --verbose=trace
env:
OPERATOR_KEY_MAIN: ${{ secrets.operator_key }}

- name: Stop relay
run: docker stop json-rpc-relay json-rpc-relay-ws
Expand Down
25 changes: 19 additions & 6 deletions .github/workflows/conformity-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ jobs:
runs-on: smart-contracts-linux-medium

steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
with:
egress-policy: audit

- name: Checkout execution-apis repo
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
Expand Down Expand Up @@ -43,6 +48,11 @@ jobs:
needs: clone-and-build-execution-apis

steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
with:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

Expand Down Expand Up @@ -72,14 +82,17 @@ jobs:
- name: Install hedera local
run: npm install @hashgraph/hedera-local -g

- name: Set operator id and key env variable if CI is manual
if: ${{ inputs.operator_id }}
run: |
echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV
echo "OPERATOR_KEY_MAIN=${{ inputs.operator_key }}" >> $GITHUB_ENV
# Note: this step will never run as there are no input parameters on the workflow file or job.
# - name: Set operator id env variable if CI is manual
# if: ${{ inputs.operator_id }}
# run: |
# echo "OPERATOR_ID_MAIN=${{ inputs.operator_id }}" >> $GITHUB_ENV

rbarker-dev marked this conversation as resolved.
Show resolved Hide resolved

- name: Run hedera local
run: npx hedera restart -d --network-tag=${{inputs.networkTag}} --mirror-tag=${{inputs.mirrorTag}} --verbose=trace
rbarker-dev marked this conversation as resolved.
Show resolved Hide resolved
# Note: Since there are no input parameters to the workflow or job network tag and mirror tag are ALWAYS blank on this step
#run: npx hedera restart -d --network-tag=${{inputs.networkTag}} --mirror-tag=${{inputs.mirrorTag}} --verbose=trace
rbarker-dev marked this conversation as resolved.
Show resolved Hide resolved
run: npx hedera restart -d --network-tag="" --mirror-tag="" --verbose=trace
rbarker-dev marked this conversation as resolved.
Show resolved Hide resolved

- name: Stop relay
run: docker stop json-rpc-relay json-rpc-relay-ws
Expand Down
Loading