Merge branch 'main' into feat/complete_cli

hyperledger-iroha · Feb 4, 2025 · 1c5adf3 · 1c5adf3
2 parents 84bbd59 + 4e0067d
commit 1c5adf3
Show file tree

Hide file tree

Showing 16 changed files with 1,063 additions and 553 deletions.
diff --git a/.config/nextest.toml b/.config/nextest.toml
@@ -1,8 +1,8 @@
 [profile.default]
-retries = 2
+retries = { backoff = "fixed", count = 3, delay = "3s" }
 
 [profile.ci]
 fail-fast = false
 failure-output = "immediate-final"
-slow-timeout = { period = "30s", terminate-after = 2 }
+slow-timeout = { period = "30s", terminate-after = 4 }
 
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
@@ -220,11 +220,19 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Test docker-compose.single.yml
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml down
       - name: Test docker-compose.local.yml
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml down
       - name: Run docker-compose.yml containers
         run: docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.yml up --wait || exit 1

diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build wasm libs
-        run: ./scripts/build_wasm.sh libs
+        run: ./scripts/build_wasm.sh --profile=deploy libs
       - name: Upload wasm libs to reuse in other jobs
         uses: actions/upload-artifact@v4
         with:
@@ -67,11 +67,19 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Test docker-compose.single.yml before pushing
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.single.yml down
       - name: Test docker-compose.local.yml before pushing
         run: |
-          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || exit 1
+          docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml up --wait || {
+            echo "docker-compose failed. Logs:";
+            docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml logs --tail="all";
+            exit 1;
+          }
           docker compose -f ${{ env.DEFAULTS_DIR }}/docker-compose.local.yml down
       - name: Test docker-compose.yml before pushing
         run: |