From 5d6b9ab0d1bd9da8a31c533d034bdc205c214277 Mon Sep 17 00:00:00 2001
From: BAStos525 <66615487+BAStos525@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:24:44 +0300
Subject: [PATCH 1/2] ci: fix/remove iroha2 ci wrong params (#5206)

Signed-off-by: BAStos525 <jungle.vas@yandex.ru>
---
 .github/workflows/iroha2-custom-image.yml   | 4 ++--
 .github/workflows/iroha2-dev-sonar-dojo.yml | 9 ---------
 .github/workflows/iroha2-dev.yml            | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/iroha2-custom-image.yml b/.github/workflows/iroha2-custom-image.yml
index deacd0d5e95..1256d52ff2f 100644
--- 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
index 500261e260d..d369581946e 100644
--- 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/defectdojo-action@1.0.5
diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml
index c4f982c78eb..db3ba516632 100644
--- 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:

From 5a87ecf21c265958465de0413636951b9bef39a4 Mon Sep 17 00:00:00 2001
From: Mykhailo Lohachov <lohachov@soramitsu.co.jp>
Date: Wed, 30 Oct 2024 17:42:07 +0900
Subject: [PATCH 2/2] fix: build_wasm copy executor to defaults (#5207)

Signed-off-by: Lohachov Mykhailo <lohachov@soramitsu.co.jp>
---
 scripts/build_wasm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build_wasm.sh b/scripts/build_wasm.sh
index ef95f6fbfce..0b9a1153ddf 100755
--- 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"