Merge branch 'develop' into feature/amd-amf

Author: voluntas

.github/workflows/build.yml

@@ -51,7 +51,7 @@ jobs:
           name: sora_sdk
           path: sora_sdk/
 
-  build_linux_macos:
+  build_ubuntu:
     strategy:
       fail-fast: false
       matrix:
@@ -65,18 +65,6 @@ jobs:
             runs_on: ubuntu-22.04
             os: ubuntu
             arch: x86_64
-          - name: macos-15_arm64
-            target: macos_arm64
-            runs_on: macos-15
-            os: macos
-            python_host_platform: "macosx-15.0-arm64"
-            archflags: "-arch arm64"
-          - name: macos-14_arm64
-            target: macos_arm64
-            runs_on: macos-14
-            os: macos
-            python_host_platform: "macosx-14.0-arm64"
-            archflags: "-arch arm64"
         python_version:
           - "3.11"
           - "3.12"
@@ -102,64 +90,34 @@ jobs:
           cp sora_sdk/py.typed src/sora_sdk/py.typed
           cp sora_sdk/sora_sdk_ext.pyi src/sora_sdk/sora_sdk_ext.pyi
       # libx11-dev は Ubuntu 24.04 の時に必要になる
-      - if: ${{ matrix.platform.os == 'ubuntu'}}
-        run: |
+      - run: |
           sudo apt-get update
           sudo apt-get -y install libx11-dev
-      - if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'armv8' }}
+      - if: ${{ matrix.platform.arch == 'armv8' }}
         run: |
           sudo apt-get -y install multistrap binutils-aarch64-linux-gnu
           # multistrap に insecure なリポジトリからの取得を許可する設定を入れる
           sudo sed -e 's/Apt::Get::AllowUnauthenticated=true/Apt::Get::AllowUnauthenticated=true";\n$config_str .= " -o Acquire::AllowInsecureRepositories=true/' -i /usr/sbin/multistrap
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: false
-      - run: uv python pin ${{ matrix.python_version }}
-      - run: uv sync
+      - run: |
+          uv python pin ${{ matrix.python_version }}
+          uv sync
 
-      # Ubuntu x86_64 向け
-      - if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64' }}
-        name: Tailscale
-        uses: tailscale/github-action@v3
-        with:
-          oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
-          oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
-          tags: tag:ci
-        
-      - if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64' }}
+      - if: ${{ matrix.platform.arch == 'x86_64' }}
         run: |
           uv run python run.py ${{ matrix.platform.target }}
           uv run python -m build
 
       # Ubuntu armv8 向け
-      - if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'armv8' }}
+      - if: ${{ matrix.platform.arch == 'armv8' }}
         run: |
           uv run python run.py ${{ matrix.platform.target }}
           uv run python -m build
         env:
           SORA_SDK_TARGET: ${{ matrix.platform.target }}
 
-      # Ubuntu 向けに Python 3.11 では E2E テストを実行する
-      - if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64' && matrix.python_version == '3.11' }}
-        name: Download openh264
-        run: |
-          curl -LO http://ciscobinary.openh264.org/libopenh264-${{ env.OPENH264_VERSION }}-linux64.8.so.bz2
-          bzip2 -d libopenh264-${{ env.OPENH264_VERSION }}-linux64.8.so.bz2
-          mv libopenh264-${{ env.OPENH264_VERSION }}-linux64.8.so libopenh264.so
-          echo "OPENH264_PATH=$(pwd)/libopenh264.so" >> $GITHUB_ENV
-      - if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64' && matrix.python_version == '3.11' }}
-        run: uv run pytest tests -s
-
-
-      # macOS 向け
-      - if: ${{ matrix.platform.os == 'macos' }}
-        run: |
-          uv run python run.py ${{ matrix.platform.target }}
-          uv run python -m build
-        env:
-          _PYTHON_HOST_PLATFORM: ${{ matrix.platform.python_host_platform }}
-          ARCHFLAGS: ${{ matrix.platform.archflags }}
-
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -208,14 +166,65 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: false
-      - run: uv python pin ${{ matrix.python_version }}
-      - run: uv sync
       - run: |
+          uv python pin ${{ matrix.python_version }}
+          uv sync
           uv run python run.py ${{ matrix.platform.target }}
           uv run python -m build
         env:
           SORA_SDK_TARGET: ${{ matrix.platform.target }}
 
+  build_macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - name: macos-15_arm64
+            target: macos_arm64
+            runs_on: macos-15
+            os: macos
+            python_host_platform: "macosx-15.0-arm64"
+            archflags: "-arch arm64"
+          - name: macos-14_arm64
+            target: macos_arm64
+            runs_on: macos-14
+            os: macos
+            python_host_platform: "macosx-14.0-arm64"
+            archflags: "-arch arm64"
+        python_version:
+          - "3.11"
+          - "3.12"
+          - "3.13"
+    needs: [build_pyi] 
+    runs-on: ${{ matrix.platform.runs_on }}
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: sora_sdk
+          path: sora_sdk/
+      - run: |
+          cp sora_sdk/py.typed src/sora_sdk/py.typed
+          cp sora_sdk/sora_sdk_ext.pyi src/sora_sdk/sora_sdk_ext.pyi
+      - uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: false
+      - run: |
+          uv python pin ${{ matrix.python_version }}
+          uv sync
+          uv run python run.py ${{ matrix.platform.target }}
+          uv run python -m build
+        env:
+          _PYTHON_HOST_PLATFORM: ${{ matrix.platform.python_host_platform }}
+          ARCHFLAGS: ${{ matrix.platform.archflags }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.platform.name }}_python-${{ matrix.python_version }}
+          path: "dist/"
+
   build_windows:
     needs: [build_pyi] 
     runs-on: windows-2022
@@ -240,10 +249,11 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: false
-      - run: uv python pin ${{ matrix.python_version }}
-      - run: uv sync
-      - run: uv run python run.py windows_x86_64
-      - run: uv run python -m build
+      - run: |
+          uv python pin ${{ matrix.python_version }}
+          uv sync
+          uv run python run.py windows_x86_64
+          uv run python -m build
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
@@ -252,7 +262,7 @@ jobs:
           path: dist/
 
   # slack_notify_succeeded:
-  #   needs: [build_linux_macos, build_ubuntu_arm, build_windows]
+  #   needs: [build_ubuntu, build_ubuntu_arm, build_macos, build_windows]
   #   runs-on: ubuntu-24.04
   #   if: success()
   #   steps:
@@ -266,7 +276,7 @@ jobs:
   #        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   slack_notify_failed:
-    needs: [build_linux_macos, build_ubuntu_arm, build_windows]
+    needs: [build_ubuntu, build_ubuntu_arm, build_macos,build_windows]
     runs-on: ubuntu-24.04
     if: failure()
     steps:
@@ -282,7 +292,8 @@ jobs:
   publish_wheel:
     if: contains(github.ref, 'tags/202')
     needs:
-      - build_linux_macos
+      - build_ubuntu
+      - build_macos
       - build_windows
     strategy:
       fail-fast: false
@@ -341,7 +352,8 @@ jobs:
   create-release:
     if: contains(github.ref, 'tags/202')
     needs:
-      - build_linux_macos
+      - build_ubuntu
+      - build_macos
       - build_windows
     runs-on: ubuntu-24.04
     timeout-minutes: 60

.github/workflows/e2e-test-apple-video-toolbox.yml

@@ -32,7 +32,7 @@ jobs:
           - "3.13"
     runs-on:
       group: Self
-      labels: [self-hosted, self-hosted, macOS, ARM64, M2Pro]
+      labels: [self-hosted, self-hosted, macOS, ARM64, Apple-M2-Pro]
     timeout-minutes: 15
     if: >-
       ${{

.github/workflows/e2e-test-nvidia-video-codec-sdk.yml

@@ -0,0 +1,81 @@
+name: e2e-test-nvidia-video-codec-sdk
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - ".github/workflows/e2e-test-nvidia-video-codec-sdk.yml"
+      - "tests/test_nvidia_video_codec_sdk.py"
+      # C++ SDK のアップデートしたときテストするため
+      - "VERSION"
+  schedule:
+    # UTC の 01:00 は JST だと 10:00 。
+    # 1-5 で 月曜日から金曜日
+    - cron: "0 1 * * 1-5"
+
+env:
+  TEST_SIGNALING_URLS: ${{ secrets.TEST_SIGNALING_URLS }}
+  TEST_CHANNEL_ID_PREFIX: ${{ secrets.TEST_CHANNEL_ID_PREFIX }}
+  TEST_SECRET_KEY: ${{ secrets.TEST_SECRET_KEY }}
+  TEST_API_URL: ${{ secrets.TEST_API_URL }}
+  NVIDIA_VIDEO_CODEC_SDK: true
+
+jobs:
+  e2e_test_nvidia_video_codec_sdk:
+    strategy:
+      fail-fast: true
+      matrix:
+        python_version:
+          # TODO: push 時には 3.13 でテストする、schedule 時には全部でテストする
+          # - "3.11"
+          # - "3.12"
+          - "3.13"
+    runs-on:
+      group: Self
+      labels: [self-hosted, linux, x64, NVIDIA-Video-Codec-SDK]
+    timeout-minutes: 15
+    if: >-
+      ${{
+        contains(github.event.head_commit.message, '[e2e]') ||
+        contains(github.ref, 'feature/e2e-test') ||
+        github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event_name == 'schedule'
+      }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: false
+      - run: uv python pin ${{ matrix.python_version }}
+      - run: uv sync
+      - run: uv run python run.py ubuntu-24.04_x86_64
+      - run: uv run pytest tests/test_nvidia_video_codec_sdk.py -v
+
+  # slack_notify_succeeded:
+  #   needs: [e2e_test_intel_vpl]
+  #   runs-on: ubuntu-24.04
+  #   if: success()
+  #   steps:
+  #     - name: Slack Notification
+  #       uses: rtCamp/action-slack-notify@v2
+  #       env:
+  #         SLACK_CHANNEL: sora-python-sdk
+  #         SLACK_COLOR: good
+  #         SLACK_TITLE: SUCCEEDED
+  #         SLACK_ICON_EMOJI: ":star-struck:"
+  #         SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+
+  slack_notify_failed:
+    needs: [e2e_test_nvidia_video_codec_sdk]
+    runs-on: ubuntu-24.04
+    if: failure()
+    steps:
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: sora-python-sdk
+          SLACK_COLOR: danger
+          SLACK_TITLE: "FAILED"
+          SLACK_ICON_EMOJI: ":japanese_ogre:"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}