Merge branch 'release/2023.17.0'

shiguredo · Dec 25, 2023 · 38a6c0a · 38a6c0a
2 parents f48d459 + 15fab19
commit 38a6c0a
Show file tree

Hide file tree

Showing 26 changed files with 160,689 additions and 101 deletions.
diff --git a/.github/actions/download/action.yml b/.github/actions/download/action.yml
@@ -10,7 +10,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.platform }}.env
         path: ${{ inputs.platform }}.env
@@ -26,15 +26,15 @@ runs:
         echo "$BOOST_PACKAGE_NAME/$BOOST_PACKAGE_NAME" >> package_paths.env
         echo "$LYRA_PACKAGE_NAME/$LYRA_PACKAGE_NAME" >> package_paths.env
       id: env
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ steps.env.outputs.package_name }}
         path: ${{ steps.env.outputs.package_name }}
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ steps.env.outputs.boost_package_name }}
         path: ${{ steps.env.outputs.boost_package_name }}
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ steps.env.outputs.lyra_package_name }}
         path: ${{ steps.env.outputs.lyra_package_name }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -71,22 +71,22 @@ jobs:
           echo "lyra_name=${LYRA_PACKAGE_NAME}" >> ${Env:GITHUB_OUTPUT}
         id: package_name
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
       - name: Upload Boost Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.boost_name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.boost_name }}
       - name: Upload Lyra Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.lyra_name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.lyra_name }}
       - name: Upload Environment
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}.env
           path: _package/${{ matrix.name }}/release/sora.env
@@ -98,9 +98,11 @@ jobs:
           - macos_arm64
           - ios
     name: Build sora-cpp-sdk for ${{ matrix.name }}
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
+      - name: Select Xcode 14.3.1
+        run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
       - name: Env to output
         run: |
           echo "user=`users`" >> $GITHUB_OUTPUT
@@ -120,22 +122,22 @@ jobs:
           echo "lyra_name=${LYRA_PACKAGE_NAME}" >> $GITHUB_OUTPUT
         id: package_name
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
       - name: Upload Boost Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.boost_name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.boost_name }}
       - name: Upload Lyra Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.lyra_name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.lyra_name }}
       - name: Upload Environment
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}.env
           path: _package/${{ matrix.name }}/release/sora.env
@@ -203,22 +205,22 @@ jobs:
           echo "lyra_name=${LYRA_PACKAGE_NAME}" >> $GITHUB_OUTPUT
         id: package_name
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
       - name: Upload Boost Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.boost_name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.boost_name }}
       - name: Upload Lyra Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.lyra_name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.lyra_name }}
       - name: Upload Environment
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}.env
           path: _package/${{ matrix.name }}/release/sora.env

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -12,6 +12,7 @@
                 "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/llvm/libcxx/include",
                 "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/libva/include",
                 "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/vpl/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/blend2d/include",
                 "${workspaceFolder}/_build/ubuntu-20.04_x86_64/release/sora",
                 "${workspaceFolder}/third_party/NvCodec/include",
                 "${workspaceFolder}/third_party/NvCodec/NvCodec",
@@ -46,6 +47,7 @@
                 "${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/sora",
                 "${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/rootfs/usr/src/jetson_multimedia_api/include",
                 "${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/rootfs/usr/src/jetson_multimedia_api/include/libjpeg-8b",
+                "${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/blend2d/include",
                 "${workspaceFolder}/_build/ubuntu-20.04_armv8_jetson/release/sora",
                 "${workspaceFolder}/include"
             ],
@@ -75,6 +77,7 @@
                 "${workspaceFolder}/_install/android/release/webrtc/include/third_party/zlib",
                 "${workspaceFolder}/_install/android/release/llvm/libcxx/include",
                 "${workspaceFolder}/_install/android/release/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/",
+                "${workspaceFolder}/_install/android/release/blend2d/include",
                 "${workspaceFolder}/_build/android/release/sora",
                 "${workspaceFolder}/include"
             ],
@@ -104,6 +107,7 @@
                 "${workspaceFolder}/_install/macos_x86_64/release/webrtc/include/third_party/libyuv/include",
                 "${workspaceFolder}/_install/macos_x86_64/release/webrtc/include/third_party/zlib",
                 "${workspaceFolder}/_install/macos_x86_64/release/webrtc/include/sdk/objc",
+                "${workspaceFolder}/_install/macos_x86_64/release/blend2d/include",
                 "${workspaceFolder}/_build/macos_x86_64/release/sora",
                 "${workspaceFolder}/include"
             ],
@@ -127,6 +131,7 @@
                 "${workspaceFolder}/_install/windows_x86_64/release/webrtc/include/third_party/boringssl/src/include",
                 "${workspaceFolder}/_install/windows_x86_64/release/webrtc/include/third_party/libyuv/include",
                 "${workspaceFolder}/_install/windows_x86_64/release/webrtc/include/third_party/zlib",
+                "${workspaceFolder}/_install/windows_x86_64/release/blend2d/include",
                 "${workspaceFolder}/_build/windows_x86_64/release/sora",
                 "${workspaceFolder}/third_party/NvCodec/include",
                 "${workspaceFolder}/third_party/NvCodec/NvCodec",
@@ -148,6 +153,7 @@
             "includePath": [
                 "${workspaceFolder}/_install/windows_x86_64/debug/boost/include",
                 "${workspaceFolder}/_install/windows_x86_64/debug/cuda/nvcc/include",
+                "${workspaceFolder}/_install/windows_x86_64/debug/blend2d/include",
                 "${workspaceFolder}/_source/windows_x86_64/debug/webrtc/src",
                 "${workspaceFolder}/_source/windows_x86_64/debug/webrtc/src/third_party/abseil-cpp",
                 "${workspaceFolder}/_source/windows_x86_64/debug/webrtc/src/third_party/boringssl/src/include",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,8 +1,6 @@
 {
-    "python.linting.flake8Enabled": true,
-    "python.linting.flake8Args": ["--max-line-length=120"],
-    "python.linting.enabled": true,
-    "python.formatting.autopep8Args": ["--max-line-length", "120", "--experimental"],
+    "flake8.args": ["--max-line-length=120"],
+    "autopep8.args": ["--max-line-length", "120", "--experimental"],
     "[python]": {
         "editor.formatOnSave": true,
         "editor.formatOnSaveMode": "file"

diff --git a/CHANGES.md b/CHANGES.md
@@ -11,10 +11,16 @@
 
 ## develop
 
+## 2023.17.0 (2023-12-25)
+
+- [UPDATE] WebRTC を `m120.6099.1.2` に上げる
+  - `m120.6099.1.1` より x86 シミュレータビルドがなくなったため、CI で ios の test ビルドを行わなくした
+  - @melpon @enm10k @torikizi @miosakuma
+
 ## 2023.16.1 (2023-12-02)
 
-- [FIX] WebRTC を m119.6045.2.2 に上げる
-  - iOS の非公開 API を利用していたため、App Store でリジェクトされてしまうのを修正
+- [FIX] WebRTC を `m119.6045.2.2` に上げる
+  - Apple 非公開 API を利用していたため、Apple からリジェクトされる問題を修正
   - @voluntas
 
 ## 2023.16.0 (2023-11-19)