From 0caffe58079562689edd66960ef04df71bf7efc7 Mon Sep 17 00:00:00 2001
From: BAStos525 <jungle.vas@yandex.ru>
Date: Fri, 27 Sep 2024 18:46:55 +0300
Subject: [PATCH 1/2] ci: Add dedicated workflow for pytests

Signed-off-by: BAStos525 <jungle.vas@yandex.ru>
---
 .github/workflows/pr-pytests.yml | 43 ++++++++++++++++++++++++++++++++
 .github/workflows/pr.yml         | 37 ---------------------------
 2 files changed, 43 insertions(+), 37 deletions(-)
 create mode 100644 .github/workflows/pr-pytests.yml

diff --git a/.github/workflows/pr-pytests.yml b/.github/workflows/pr-pytests.yml
new file mode 100644
index 00000000..d38038f5
--- /dev/null
+++ b/.github/workflows/pr-pytests.yml
@@ -0,0 +1,43 @@
+name: Iroha 2 pull request pytests
+
+on:
+  repository_dispatch:
+    types: [dispatch-event]
+
+env:
+  IROHA_REF: 2.0.0-pre-rc.22
+
+jobs:
+  pytest:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ 3.12 ]
+    steps:
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: pip install poetry
+      - name: Checkout iroha main repo code
+        uses: actions/checkout@v4
+        with:
+          repository: 'hyperledger/iroha'
+          ref: ${{ env.IROHA_REF}}
+      - name: Run docker-compose.yml containers
+        run: docker compose -f ./configs/swarm/docker-compose.yml up --wait || exit 1
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Maturin build
+        run: |
+          pip install maturin
+          maturin build
+          poetry add target/wheels/*
+      - name: Install project dependencies
+        run: poetry install
+      - name: Run tests
+        run: poetry run pytest tests
+      - name: Tear down docker containers
+        if: always()
+        run: docker stop $(docker ps -q) && docker rm $(docker ps -a -q)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 997b76ed..b3c9e76d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -38,43 +38,6 @@ jobs:
           yapf --style pep8 -e 'iroha2/sys/**/*.py' -r -i iroha2 example
           git diff --quiet
 
-  pytest:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ 3.12 ]
-    steps:
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          pip install poetry
-      - name: Checkout Iroha code
-        uses: actions/checkout@v4
-        with:
-          repository: 'hyperledger/iroha'
-          ref: '2.0.0-pre-rc.22'
-      - name: Run docker-compose.yml containers
-        run: |
-          docker compose -f ./configs/swarm/docker-compose.yml up --wait || exit 1
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Maturin build
-        run: |
-          pip install maturin
-          maturin build
-          poetry add target/wheels/*
-      - name: Install project dependencies
-        run: poetry install
-      - name: Run tests
-        run: poetry run pytest tests
-      - name: Tear down Docker containers
-        if: always()
-        run: |
-          docker stop $(docker ps -q) && docker rm $(docker ps -a -q)
-
   integration-test:
     runs-on: iroha-ubuntu-latest
     steps:

From 40fb735ff9d8e01a06d5d7bf40cb6f8fddeb98ab Mon Sep 17 00:00:00 2001
From: BAStos525 <jungle.vas@yandex.ru>
Date: Mon, 14 Oct 2024 13:50:16 +0300
Subject: [PATCH 2/2] ci: add pr trigger to pytests workflow

Signed-off-by: BAStos525 <jungle.vas@yandex.ru>
---
 .github/workflows/pr-pytests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pr-pytests.yml b/.github/workflows/pr-pytests.yml
index d38038f5..06c91625 100644
--- a/.github/workflows/pr-pytests.yml
+++ b/.github/workflows/pr-pytests.yml
@@ -3,6 +3,8 @@ name: Iroha 2 pull request pytests
 on:
   repository_dispatch:
     types: [dispatch-event]
+  pull_request:
+    branches: [main]
 
 env:
   IROHA_REF: 2.0.0-pre-rc.22