shiguredo
diff --git a/‎.github/actions/download-sumomo/action.yml‎
Lines changed: 93 additions & 0 deletions b/‎.github/actions/download-sumomo/action.yml‎
Lines changed: 93 additions & 0 deletions
diff --git a/‎.github/workflows/build.yml‎
Lines changed: 12 additions & 11 deletions b/‎.github/workflows/build.yml‎
Lines changed: 12 additions & 11 deletions
diff --git a/‎.github/workflows/e2e-test.yml‎
Lines changed: 159 additions & 0 deletions b/‎.github/workflows/e2e-test.yml‎
Lines changed: 159 additions & 0 deletions
diff --git a/‎.github/workflows/formatter.yml‎
Lines changed: 6 additions & 7 deletions b/‎.github/workflows/formatter.yml‎
Lines changed: 6 additions & 7 deletions
diff --git a/‎.gitignore‎
Lines changed: 11 additions & 1 deletion b/‎.gitignore‎
Lines changed: 11 additions & 1 deletion
@@ -0,0 +1,93 @@
+name: Download Sumomo Binary
+description: Download sumomo binary from artifact or release
+
+inputs:
+  platform-name:
+    description: 'Platform name (e.g., ubuntu-22.04_x86_64, windows_x86_64, macos_arm64)'
+    required: true
+  branch-name:
+    description: 'Branch name to search for artifacts'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Download sumomo artifact
+      shell: bash
+      run: |
+        # 同一ブランチの最新の成功したビルドワークフローの実行を取得
+        RUN_ID=$(gh run list --workflow=build.yml --branch=${{ inputs.branch-name }} --status=success --limit=1 --json databaseId --jq '.[0].databaseId')
+
+        if [ -n "$RUN_ID" ]; then
+          echo "ブランチ ${{ inputs.branch-name }} の成功したビルドが見つかりました: $RUN_ID"
+          # アーティファクトをダウンロード
+          gh run download $RUN_ID --name examples_${{ inputs.platform-name }} --dir ./sumomo_binary
+        else
+          echo "ブランチ ${{ inputs.branch-name }} の成功したビルドが見つかりません"
+          echo "VERSION ファイルから release バージョンを取得してダウンロードします"
+
+          # VERSION ファイルからバージョンを取得
+          VERSION=$(cat VERSION | head -n1)
+          echo "VERSION: $VERSION"
+
+          # プラットフォームに応じたアーカイブ形式を決定
+          if [[ "${{ inputs.platform-name }}" == windows_* ]]; then
+            ARCHIVE_NAME="sumomo_${{ inputs.platform-name }}.zip"
+          else
+            ARCHIVE_NAME="sumomo_${{ inputs.platform-name }}.tar.gz"
+          fi
+
+          echo "リリース $VERSION から $ARCHIVE_NAME をダウンロードします"
+
+          # リリースアセットをダウンロード
+          gh release download "$VERSION" --pattern "$ARCHIVE_NAME"
+
+          # アーカイブを展開
+          mkdir -p sumomo_binary
+
+          if [[ "${{ inputs.platform-name }}" == windows_* ]]; then
+            # Windows の場合は zip を展開
+            unzip -q "$ARCHIVE_NAME" -d .
+            mv "sumomo_${{ inputs.platform-name }}"/* sumomo_binary/
+          else
+            # Linux/macOS の場合は tar.gz を展開
+            tar -xzf "$ARCHIVE_NAME" -C sumomo_binary --strip-components=1
+          fi
+
+          # ダウンロードしたアーカイブを削除
+          rm "$ARCHIVE_NAME"
+        fi
+      env:
+        GH_TOKEN: ${{ github.token }}
+
+    - name: Setup sumomo binary
+      shell: bash
+      run: |
+        # ダウンロードしたバイナリを確認
+        ls -la sumomo_binary/
+
+        # sumomo.py が期待するディレクトリ構造を作成
+        mkdir -p examples/_build/${{ inputs.platform-name }}/release/sumomo/
+
+        # プラットフォームに応じたバイナリ名を決定
+        if [[ "${{ inputs.platform-name }}" == windows_* ]]; then
+          BINARY_NAME="sumomo.exe"
+        else
+          BINARY_NAME="sumomo"
+        fi
+
+        # sumomo バイナリを期待される場所に配置
+        # raspberry_pi の場合は libcamera などの共有ライブラリも含めてすべてコピー
+        if [[ "${{ inputs.platform-name }}" == "raspberry-pi-os_armv8" ]]; then
+          cp -r sumomo_binary/* examples/_build/${{ inputs.platform-name }}/release/sumomo/
+        else
+          cp sumomo_binary/$BINARY_NAME examples/_build/${{ inputs.platform-name }}/release/sumomo/
+        fi
+
+        # Linux/macOS の場合は実行権限を付与
+        if [[ "${{ inputs.platform-name }}" != windows_* ]]; then
+          chmod +x examples/_build/${{ inputs.platform-name }}/release/sumomo/$BINARY_NAME
+        fi
+
+        # パスを確認
+        ls -la examples/_build/${{ inputs.platform-name }}/release/sumomo/$BINARY_NAME
@@ -7,10 +7,13 @@ on:
       - "**.md"
       - "LICENSE"
       - "NOTICE"
+      - ".github/workflows/e2e-test.yml"
+      - "e2e-test/**"
   schedule:
     # UTC の 01:00 は JST だと 10:00 。
     # 1-5 で 月曜日から金曜日
     - cron: "0 1 * * 1-5"
+  workflow_dispatch:
 
 jobs:
   build-windows:
@@ -87,7 +90,7 @@ jobs:
           cd examples
           mkdir examples_${{ matrix.name }}
           foreach ($app in @('sdl_sample', 'sumomo', 'messaging_recvonly_sample')) {
-            python3 "$app\${{ matrix.name }}\run.py" --local-sora-cpp-sdk-dir ..
+            python3 "$app\run.py" build ${{ matrix.name }} --local-sora-cpp-sdk-dir ..
             cp "_build\${{ matrix.name }}\release\$app\Release\$app.exe" "examples_${{ matrix.name }}"
           }
       - name: Upload Examples Artifact
@@ -143,7 +146,7 @@ jobs:
           cd examples
           mkdir examples_${{ matrix.name }}
           for app in sdl_sample sumomo messaging_recvonly_sample; do
-            python3 $app/${{ matrix.name }}/run.py --local-sora-cpp-sdk-dir ..
+            python3 $app/run.py build ${{ matrix.name }} --local-sora-cpp-sdk-dir ..
             cp _build/${{ matrix.name }}/release/$app/$app examples_${{ matrix.name }}
           done
         if: matrix.name == 'macos_arm64'
@@ -290,12 +293,12 @@ jobs:
           name: ${{ matrix.platform.name }}.env
           path: _package/${{ matrix.platform.name }}/release/sora.env
       - name: Build Examples
-        if: matrix.platform.os == 'ubuntu' && matrix.platform.name != 'ubuntu-22.04_armv8'
+        if: matrix.platform.os == 'ubuntu'
         run: |
           cd examples
           mkdir examples_${{ matrix.platform.name }}
           for app in sdl_sample sumomo messaging_recvonly_sample; do
-            python3 $app/${{ matrix.platform.name }}/run.py --local-sora-cpp-sdk-dir ..
+            python3 $app/run.py build ${{ matrix.platform.name }} --local-sora-cpp-sdk-dir ..
             cp _build/${{ matrix.platform.name }}/release/$app/$app examples_${{ matrix.platform.name }}
           done
       - name: Build Examples (Raspberry Pi OS)
@@ -304,15 +307,13 @@ jobs:
           cd examples
           mkdir examples_${{ matrix.platform.name }}
           for app in sumomo; do
-            python3 $app/${{ matrix.platform.name }}/run.py --local-sora-cpp-sdk-dir ..
+            python3 $app/run.py build ${{ matrix.platform.name }} --local-sora-cpp-sdk-dir ..
             cp _build/${{ matrix.platform.name }}/release/$app/$app examples_${{ matrix.platform.name }}
             # raspberry-pi-os は libcamerac.so も必要
             cp _build/${{ matrix.platform.name }}/release/$app/libcamerac.so examples_${{ matrix.platform.name }}
           done
       - name: Upload Examples Artifact
-        if: |
-          (matrix.platform.os == 'ubuntu' && matrix.platform.name != 'ubuntu-22.04_armv8') ||
-          (matrix.platform.os == 'raspberry-pi-os')
+        if: matrix.platform.os == 'ubuntu' || matrix.platform.os == 'raspberry-pi-os'
         uses: actions/upload-artifact@v4
         with:
           name: examples_${{ matrix.platform.name }}
@@ -393,7 +394,7 @@ jobs:
       - uses: actions/checkout@v5
       - name: Build Example
         run: |
-          python3 ${{ matrix.example }}/windows_x86_64/run.py
+          python3 ${{ matrix.example }}/run.py build windows_x86_64
       - name: Package Binary
         run: |
           # アップロード用のディレクトリを作成する
@@ -423,7 +424,7 @@ jobs:
       - uses: actions/checkout@v5
       - name: Build Example
         run: |
-          python3 ${{ matrix.example }}/macos_arm64/run.py
+          python3 ${{ matrix.example }}/run.py build macos_arm64
       - name: Package Binary
         run: |
           # アップロード用のディレクトリを作成する
@@ -479,7 +480,7 @@ jobs:
           sudo sed -e 's/Apt::Get::AllowUnauthenticated=true/Apt::Get::AllowUnauthenticated=true";\n$config_str .= " -o Acquire::AllowInsecureRepositories=true/' -i /usr/sbin/multistrap
       - name: Build Example
         run: |
-          python3 ${{ matrix.example }}/${{ matrix.platform.name }}/run.py
+          python3 ${{ matrix.example }}/run.py build ${{ matrix.platform.name }}
       - name: Package Binary
         run: |
           # アップロード用のディレクトリを作成する
 
@@ -0,0 +1,159 @@
+name: e2e-test-workflow
+
+on:
+  push:
+    paths:
+      - "e2e-test/**"
+      - ".github/workflows/e2e-test.yml"
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  e2e-test:
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - name: ubuntu-24.04_x86_64
+            platform-name: ubuntu-24.04_x86_64
+            runs-on: ubuntu-24.04
+          - name: ubuntu-22.04_x86_64
+            platform-name: ubuntu-22.04_x86_64
+            runs-on: ubuntu-22.04
+          - name: ubuntu-24.04_armv8
+            platform-name: ubuntu-24.04_armv8
+            runs-on: ubuntu-24.04-arm
+          - name: ubuntu-22.04_armv8
+            platform-name: ubuntu-22.04_armv8
+            runs-on: ubuntu-22.04-arm
+          - name: macos_arm64
+            platform-name: macos_arm64
+            runs-on: macos-14
+          - name: windows_x86_64
+            platform-name: windows_x86_64
+            runs-on: windows-2025
+          # Self-hosted runner for Apple Video Toolbox
+          - name: apple_video_toolbox
+            platform-name: macos_arm64
+            runs-on:
+              group: Self
+              labels: [self-hosted, macOS, ARM64, Apple-M2-Pro]
+            test-target: test_sumomo_apple_video_toolbox.py
+            env-vars: |
+              APPLE_VIDEO_TOOLBOX=true
+          # Self-hosted runner for NVIDIA Video Codec
+          - name: nvidia_video_codec
+            platform-name: ubuntu-24.04_x86_64
+            runs-on:
+              group: Self
+              labels: [self-hosted, linux, x64, NVIDIA-Video-Codec-SDK]
+            test-target: test_sumomo_nvidia_video_codec.py
+            env-vars: |
+              NVIDIA_VIDEO_CODEC=true
+          # Self-hosted runner for Intel VPL
+          - name: intel_vpl
+            platform-name: ubuntu-24.04_x86_64
+            runs-on:
+              group: Self
+              labels: [self-hosted, linux, x64, Intel-VPL]
+            test-target: test_sumomo_intel_vpl.py
+            env-vars: |
+              INTEL_VPL=true
+              LIBVA_MESSAGING_LEVEL=0
+          # Self-hosted runner for AMD AMF
+          # AMD-AMF はあまりにも不安定なため、安定するまでコメントアウトする
+          # - name: amd_amf
+          #   platform-name: ubuntu-24.04_x86_64
+          #   runs-on:
+          #     group: Self
+          #     labels: [self-hosted, linux, x64, AMD-AMF]
+          #   env-vars: |
+          #     AMD_AMF=true
+          #   test-target: test_sumomo_amd_amf.py
+          # Self-hosted runner for Raspberry Pi
+          - name: raspberry_pi
+            platform-name: raspberry-pi-os_armv8
+            runs-on:
+              group: Self
+              labels: [self-hosted, linux, arm64, Raspberry-Pi]
+            test-target: test_sumomo_raspberry_pi.py
+            env-vars: |
+              RASPBERRY_PI=true
+    name: E2E Test for ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.runs-on }}
+    env:
+      TEST_SIGNALING_URL: ${{ secrets.TEST_SIGNALING_URL }}
+      TEST_CHANNEL_ID_PREFIX: ${{ secrets.TEST_CHANNEL_ID_PREFIX }}
+      TEST_SECRET_KEY: ${{ secrets.TEST_SECRET_KEY }}
+      OPENH264_VERSION: 2.6.0
+    steps:
+      - uses: actions/checkout@v5
+
+      # Homebrew のセットアップ (self-hosted macOS ランナー用)
+      - name: Setup Homebrew
+        if: ${{ runner.environment == 'self-hosted' && startsWith(matrix.platform.platform-name, 'macos') }}
+        uses: Homebrew/actions/setup-homebrew@master
+
+      # GitHub CLI のインストール (self-hosted macOS ランナー用)
+      - name: Install GitHub CLI
+        if: ${{ runner.environment == 'self-hosted' && startsWith(matrix.platform.platform-name, 'macos') }}
+        run: |
+          if ! command -v gh &> /dev/null; then
+            echo "gh コマンドが見つかりません。インストールします。"
+            brew install gh
+          else
+            echo "gh コマンドは既にインストールされています。"
+          fi
+
+      # UV のセットアップ
+      - uses: astral-sh/setup-uv@v7
+      - run: uv sync
+        working-directory: ./e2e-test
+
+      # ランタイム依存関係のインストール (GitHub-hosted Linux のみ)
+      - name: Install system dependencies
+        if: ${{ runner.environment != 'self-hosted' && runner.os == 'Linux' }}
+        run: |
+          sudo apt-get update
+          # X11
+          sudo apt-get install -y libx11-dev libxext-dev
+          # OpenGL
+          sudo apt-get install -y libgl-dev
+
+      # 環境変数の設定 (HWA テスト用)
+      - name: Set environment variables
+        if: matrix.platform.env-vars
+        run: |
+          echo "${{ matrix.platform.env-vars }}" | while read line; do
+            if [ -n "$line" ]; then
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done
+
+      # OpenH264 のダウンロード (GitHub-hosted ランナーのみ)
+      - name: Download OpenH264
+        if: ${{ runner.environment != 'self-hosted' }}
+        uses: shiguredo/github-actions/.github/actions/download-openh264@main
+        id: openh264
+        with:
+          openh264_version: ${{ env.OPENH264_VERSION }}
+          use-cache: true
+
+      # OpenH264 環境変数の設定 (GitHub-hosted ランナーのみ)
+      - name: Setup OpenH264 environment
+        if: ${{ runner.environment != 'self-hosted' && steps.openh264.outputs.openh264_path }}
+        run: echo "OPENH264_PATH=${{ steps.openh264.outputs.openh264_path }}" >> $GITHUB_ENV
+
+      # self-hosted runner の場合このダウンロードが凄く時間かかる
+      - name: Download and setup sumomo binary
+        uses: ./.github/actions/download-sumomo
+        with:
+          platform-name: ${{ matrix.platform.platform-name }}
+          branch-name: ${{ github.ref_name }}
+
+      - name: Run E2E tests
+        run: |
+          # テストを実行（最初の失敗で停止、詳細ログ出力）
+          uv run pytest -v -x ${{ matrix.platform.test-target || '.' }}
+        working-directory: ./e2e-test
@@ -3,11 +3,10 @@ name: formatter
 on:
   workflow_dispatch:
   push:
-    paths-ignore:
-      - "doc/**"
-      - "**.md"
-      - "LICENSE"
-      - "NOTICE"
+    paths:
+      - "src/**"
+      - "include/**"
+      - "examples/**"
 
 jobs:
   run-ubuntu:
@@ -65,7 +64,7 @@ jobs:
         run: |
           cd examples
           for app in sdl_sample sumomo messaging_recvonly_sample; do
-            python3 $app/${{ matrix.platform.name }}/run.py \
+            python3 $app/run.py build ${{ matrix.platform.name }} \
               --local-sora-cpp-sdk-dir .. \
               --local-sora-cpp-sdk-args=--disable-cuda \
               --install-dir `pwd`/../_install/${{ matrix.platform.name }}/release
@@ -121,4 +120,4 @@ jobs:
           SLACK_MESSAGE: |
             ```
             ${{ needs.run-ubuntu.outputs.diff }}
-            ```
+            ```
@@ -14,4 +14,14 @@ xcuserdata/
 
 # claude
 CLAUDE.local.md
-/.claude
+/.claude
+
+# sumomo
+.env*
+!.env.template
+
+# python
+.venv
+.mypy_cache
+__pycache__
+.pytest_cache