Merge branch 'main' into fix/5027/local_genesis

hyperledger-iroha · Oct 30, 2024 · 0c89ba4 · 0c89ba4
2 parents 29328a7 + 5a87ecf
commit 0c89ba4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/.github/workflows/iroha2-custom-image.yml b/.github/workflows/iroha2-custom-image.yml
@@ -27,7 +27,7 @@ on:
         required: true
         default: main
       PROFILER_NAME:
-        description: "Profiler value as the image tag part"
+        description: "Profiler value (glibc/alpine) as the image tag part"
         required: true
         default: glibc
 
@@ -188,7 +188,7 @@ jobs:
         if: always()
         with:
           push: true
-          tags: docker.soramitsu.co.jp/iroha2/iroha:${{ github.sha }}
+          tags: docker.soramitsu.co.jp/iroha2/iroha:${{ inputs.PROFILER_NAME }}-${{ github.sha }}
           labels: commit=${{ github.sha }}
           file: Dockerfile
           context: .
diff --git a/.github/workflows/iroha2-dev-sonar-dojo.yml b/.github/workflows/iroha2-dev-sonar-dojo.yml
@@ -16,10 +16,6 @@ jobs:
       image: hyperledger/iroha2-ci:nightly-2024-09-09
     steps:
       - uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.workflow_run.head_repository.full_name }}
-          ref: ${{ github.event.workflow_run.pull_requests[0].head.ref }}
-          fetch-depth: 0
       - name: Download clippy and lcov artifact reports
         uses: actions/download-artifact@v4
         with:
@@ -37,11 +33,6 @@ jobs:
           args: >
             -Dcommunity.rust.clippy.reportPaths=lints/clippy.json
             -Dcommunity.rust.lcov.reportPaths=lints/lcov.info
-            -Dsonar.cfamily.llvm-cov.reportPath=lints/lcov.info
-            -Dsonar.cfamily.gcov.reportsPath=lints/lcov.info
-            -Dsonar.pullrequest.key=${{ github.event.workflow_run.pull_requests[0].number }}
-            -Dsonar.pullrequest.base=${{ github.event.workflow_run.pull_requests[0].base.ref }}
-            -Dsonar.pullrequest.branch=${{ github.event.workflow_run.pull_requests[0].head.ref }}
       - name: DefectDojo
         id: defectdojo
         uses: C4tWithShell/[email protected]

diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml
@@ -90,7 +90,7 @@ jobs:
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${{ secrets.REPO_ACCESS_TOKEN }}" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/hyperledger/iroha-python/dispatches \
+            https://api.github.com/repos/hyperledger-iroha/iroha-python/dispatches \
             -d '{"event_type":"dispatch-event"}'
 
   telemetry:

diff --git a/scripts/build_wasm.sh b/scripts/build_wasm.sh
@@ -36,7 +36,7 @@ command() {
     case $1 in
         "libs")
             build $1
-            cp -r "$TARGET_DIR/$1" "$DEFAULTS_DIR/$1"
+            cp -r "$TARGET_DIR/$1" "$DEFAULTS_DIR/"
             mv "$DEFAULTS_DIR/$1/default_executor.wasm" "$DEFAULTS_DIR/executor.wasm"
             echo "info: copied wasm $1 to $DEFAULTS_DIR/$1/"
             echo "info: copied default executor to $DEFAULTS_DIR/executor.wasm"