From 064767da44333a7fcb744fbba7c7b7ed24c55820 Mon Sep 17 00:00:00 2001
From: "ry.yamafuji" <ry.yamafuji@gmail.com>
Date: Thu, 4 Dec 2025 11:43:24 +0900
Subject: [PATCH] =?UTF-8?q?pytest=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/pytest.yml | 55 ++++++++++--------------------------
 1 file changed, 15 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index e36720f..67ed1fe 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -2,10 +2,10 @@ name: Python Test
 
 on:
   workflow_dispatch:
-  pull_request:
+  push:
     branches:
       - main
-      - develop
+      # - develop
     paths:
       - 'src/**'
       - 'tests/**'
@@ -35,6 +35,18 @@ jobs:
         run: |
           pytest --junitxml=pytest.xml --cov-report term-missing --cov=src tests/ | tee pytest-coverage.txt
 
+      - name: Generate coverage-report Branch AND README.md
+        id: generateCoverageReportBranch
+        if: success()  # テスト成功時のみ実行
+        run: |
+          #  coverage-report ブランチが存在しない場合は作成 あればチェックアウト
+          if ! git ls-remote --exit-code origin coverage-report; then
+            git checkout --orphan coverage-report
+            git rm -rf .  # すべてのファイルを削除
+          else
+            git checkout coverage-report            
+          fi
+
       - name: Coverage Report
         id: CoverageReport
         if: success()  # テスト成功時のみ実行
@@ -46,43 +58,6 @@ jobs:
           generate_coverage.save_table()
           EOF
 
-      - name: Generate coverage-report Branch AND README.md
-        id: generateCoverageReportBranch
-        if: success()  # テスト成功時のみ実行
-        run: |
-          # ブランチ存在確認と安全な作成/チェックアウト処理
-          set -euo pipefail
-          
-          # 必要なファイルを一時退避
-          mkdir -p /tmp/coverage-backup
-          cp coverage.svg /tmp/coverage-backup/
-          cp coverage_table.md /tmp/coverage-backup/
-          
-          # リモート情報を取得
-          git fetch --all --prune
-
-          # coverage-report ブランチへ切り替え
-          if git ls-remote --exit-code origin coverage-report >/dev/null 2>&1; then
-            echo "Remote branch exists: origin/coverage-report"
-            if ! git rev-parse --verify coverage-report >/dev/null 2>&1; then
-              git checkout -b coverage-report origin/coverage-report
-            else
-              git checkout coverage-report
-            fi
-            # 既存ファイルをクリア（README.mdとcoverage.svgのみ残す）
-            git rm -rf . || true
-            git clean -fdx
-          else
-            echo "Remote branch missing; creating orphan local branch coverage-report"
-            git checkout --orphan coverage-report
-            git rm -rf . || true
-            git clean -fdx
-          fi
-          
-          # 退避したファイルを復元
-          cp /tmp/coverage-backup/coverage.svg .
-          cp /tmp/coverage-backup/coverage_table.md .
-
       - name: Update Readme
         id: updateReadme
         run: |
@@ -105,4 +80,4 @@ jobs:
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git add README.md coverage.svg
           git commit -m "Update coverage report"
-          git push https://actions-bot:${{ secrets.GITEA_TOKEN }}@gitea.pglikers.com/data-science/cloud-run-job-base.git coverage-report --force
+          git push https://actions-bot:${{ secrets.CICD_GITEA_TOKEN }}@gitea.pglikers.com/data-science/cloud-run-job-base.git coverage-report --force