Merge branch 'main' into 3143-add-env-masking-for-values-starting-wit…

…h-known-secret-prefixes
hashgraph · Oct 24, 2024 · 6328654 · 6328654
2 parents 62bc2f8 + b4bc10d
commit 6328654
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 38 deletions.
diff --git a/.github/workflows/acceptance-public.yml b/.github/workflows/acceptance-public.yml
@@ -51,8 +51,9 @@ jobs:
           merge-multiple: true
 
       - name: Publish Test Report
-        uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
+        uses: step-security/publish-unit-test-result-action@4519d7c9f71dd765f8bbb98626268780f23bab28 # v2.17.0
         with:
           check_name: Test Results
           json_thousands_separator: ','
-          junit_files: 'test-*.xml'
+          files: 'test-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/acceptance-workflow.yml b/.github/workflows/acceptance-workflow.yml
@@ -45,6 +45,7 @@ jobs:
     permissions:
       contents: write
       actions: read
+      checks: write
       # issues: read
     env:
       OPERATOR_ID_MAIN: ${{ inputs.operator_id }}
@@ -62,6 +63,12 @@ jobs:
         with:
           node-version: 20
 
+      - name: Install make
+        run: sudo apt-get update; sudo apt-get install build-essential -y
+
+      - name: Checkout repo
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+
       - name: Install packages
         run: npm ci
 
@@ -119,10 +126,11 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Publish Test Report
-        uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
+        uses: step-security/publish-unit-test-result-action@4519d7c9f71dd765f8bbb98626268780f23bab28 # v2.17.0
         if: ${{ !cancelled() }}
         with:
-          check_run_disabled: true
+          check_name: '' # Set to empty to disable check run
           comment_mode: off
           json_thousands_separator: ','
-          junit_files: 'test-*.xml'
+          files: 'test-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -139,9 +139,10 @@ jobs:
           merge-multiple: true
 
       - name: Publish Test Report
-        uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
+        uses: step-security/publish-unit-test-result-action@4519d7c9f71dd765f8bbb98626268780f23bab28 # v2.17.0
         with:
-          check_name: Acceptance Tests
-          check_run_disabled: true
+          # check_name: Acceptance Tests
+          check_name: '' # Set to empty to disable check run
           json_thousands_separator: ','
-          junit_files: 'test-*.xml'
+          files: 'test-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/manual-testing.yml b/.github/workflows/manual-testing.yml
@@ -42,15 +42,15 @@ jobs:
       testfilter: api_batch3
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   erc20:
     name: ERC20
     uses: ./.github/workflows/acceptance-workflow.yml
     with:
       testfilter: erc20
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   ratelimiter:
     name: Rate Limiter
     uses: ./.github/workflows/acceptance-workflow.yml
@@ -67,31 +67,31 @@ jobs:
       testfilter: hbarlimiter
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   tokencreate:
     name: Token Create
     uses: ./.github/workflows/acceptance-workflow.yml
     with:
       testfilter: tokencreate
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   tokenmanagement:
     name: Token Management
     uses: ./.github/workflows/acceptance-workflow.yml
     with:
       testfilter: tokenmanagement
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   htsprecompilev1:
     name: Precompile
     uses: ./.github/workflows/acceptance-workflow.yml
     with:
       testfilter: htsprecompilev1
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   precompilecalls:
     name: Precompile Calls
     uses: ./.github/workflows/acceptance-workflow.yml
@@ -126,7 +126,7 @@ jobs:
       test_ws_server: true
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-      
+
   cacheservice:
     name: Cache Service
     uses: ./.github/workflows/acceptance-workflow.yml
@@ -174,9 +174,10 @@ jobs:
           merge-multiple: true
 
       - name: Publish Test Report
-        uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
+        uses: step-security/publish-unit-test-result-action@4519d7c9f71dd765f8bbb98626268780f23bab28 # v2.17.0
         with:
-          check_name: Acceptance Tests
-          check_run_disabled: true
+          # check_name: Acceptance Tests
+          check_name: '' # Set to empty to disable check run
           json_thousands_separator: ','
-          junit_files: 'test-*.xml'
+          files: 'test-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-acceptance.yml b/.github/workflows/release-acceptance.yml
@@ -89,10 +89,11 @@ jobs:
           path: test-*.xml
 
       - name: Publish Test Report
-        uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
+        uses: step-security/publish-unit-test-result-action@4519d7c9f71dd765f8bbb98626268780f23bab28 # v2.17.0
         if: ${{ !cancelled() }}
         with:
-          check_run_disabled: true
+          check_name: '' # Set to empty to disable check run
           comment_mode: off
           json_thousands_separator: ','
-          junit_files: 'test-*.xml'
+          files: 'test-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -64,9 +64,10 @@ jobs:
 
       - name: Publish Test Report
         if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && github.actor != 'dependabot[bot]' && github.actor != 'swirlds-automation' && !cancelled() && !failure() }}
-        uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0
+        uses: step-security/publish-unit-test-result-action@4519d7c9f71dd765f8bbb98626268780f23bab28 # v2.17.0
         with:
-          check_name: Tests
-          check_run_disabled: true
+          # check_name: Tests
+          check_name: '' # Set to empty to disable check run
           json_thousands_separator: ','
-          junit_files: 'test-*.xml'
+          files: 'test-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/dapp-example/package-lock.json b/dapp-example/package-lock.json
diff --git a/k6/package-lock.json b/k6/package-lock.json
diff --git a/k6/package.json b/k6/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "env-cmd": "^10.1.0",
-    "ethers": "^6.13.2"
+    "ethers": "^6.13.3"
   },
   "devDependencies": {
     "@types/k6": "^0.53.1"