Skip to content

Commit 38a6c0a

Browse files
miosakumamiosakuma
committed
Merge branch 'release/2023.17.0'
2 parents f48d459 + 15fab19 commit 38a6c0a

26 files changed

+160689
-101
lines changed

‎.github/actions/download/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
runs:
1111
using: composite
1212
steps:
13-
- uses: actions/download-artifact@v3
13+
- uses: actions/download-artifact@v4
1414
with:
1515
name: ${{ inputs.platform }}.env
1616
path: ${{ inputs.platform }}.env
@@ -26,15 +26,15 @@ runs:
2626
echo "$BOOST_PACKAGE_NAME/$BOOST_PACKAGE_NAME" >> package_paths.env
2727
echo "$LYRA_PACKAGE_NAME/$LYRA_PACKAGE_NAME" >> package_paths.env
2828
id: env
29-
- uses: actions/download-artifact@v3
29+
- uses: actions/download-artifact@v4
3030
with:
3131
name: ${{ steps.env.outputs.package_name }}
3232
path: ${{ steps.env.outputs.package_name }}
33-
- uses: actions/download-artifact@v3
33+
- uses: actions/download-artifact@v4
3434
with:
3535
name: ${{ steps.env.outputs.boost_package_name }}
3636
path: ${{ steps.env.outputs.boost_package_name }}
37-
- uses: actions/download-artifact@v3
37+
- uses: actions/download-artifact@v4
3838
with:
3939
name: ${{ steps.env.outputs.lyra_package_name }}
4040
path: ${{ steps.env.outputs.lyra_package_name }}

‎.github/workflows/build.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,22 @@ jobs:
7171
echo "lyra_name=${LYRA_PACKAGE_NAME}" >> ${Env:GITHUB_OUTPUT}
7272
id: package_name
7373
- name: Upload Artifact
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: ${{ steps.package_name.outputs.name }}
7777
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
7878
- name: Upload Boost Artifact
79-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@v4
8080
with:
8181
name: ${{ steps.package_name.outputs.boost_name }}
8282
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.boost_name }}
8383
- name: Upload Lyra Artifact
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: ${{ steps.package_name.outputs.lyra_name }}
8787
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.lyra_name }}
8888
- name: Upload Environment
89-
uses: actions/upload-artifact@v3
89+
uses: actions/upload-artifact@v4
9090
with:
9191
name: ${{ matrix.name }}.env
9292
path: _package/${{ matrix.name }}/release/sora.env
@@ -98,9 +98,11 @@ jobs:
9898
- macos_arm64
9999
- ios
100100
name: Build sora-cpp-sdk for ${{ matrix.name }}
101-
runs-on: macos-12
101+
runs-on: macos-13
102102
steps:
103103
- uses: actions/checkout@v4
104+
- name: Select Xcode 14.3.1
105+
run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
104106
- name: Env to output
105107
run: |
106108
echo "user=`users`" >> $GITHUB_OUTPUT
@@ -120,22 +122,22 @@ jobs:
120122
echo "lyra_name=${LYRA_PACKAGE_NAME}" >> $GITHUB_OUTPUT
121123
id: package_name
122124
- name: Upload Artifact
123-
uses: actions/upload-artifact@v3
125+
uses: actions/upload-artifact@v4
124126
with:
125127
name: ${{ steps.package_name.outputs.name }}
126128
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
127129
- name: Upload Boost Artifact
128-
uses: actions/upload-artifact@v3
130+
uses: actions/upload-artifact@v4
129131
with:
130132
name: ${{ steps.package_name.outputs.boost_name }}
131133
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.boost_name }}
132134
- name: Upload Lyra Artifact
133-
uses: actions/upload-artifact@v3
135+
uses: actions/upload-artifact@v4
134136
with:
135137
name: ${{ steps.package_name.outputs.lyra_name }}
136138
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.lyra_name }}
137139
- name: Upload Environment
138-
uses: actions/upload-artifact@v3
140+
uses: actions/upload-artifact@v4
139141
with:
140142
name: ${{ matrix.name }}.env
141143
path: _package/${{ matrix.name }}/release/sora.env
@@ -203,22 +205,22 @@ jobs:
203205
echo "lyra_name=${LYRA_PACKAGE_NAME}" >> $GITHUB_OUTPUT
204206
id: package_name
205207
- name: Upload Artifact
206-
uses: actions/upload-artifact@v3
208+
uses: actions/upload-artifact@v4
207209
with:
208210
name: ${{ steps.package_name.outputs.name }}
209211
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
210212
- name: Upload Boost Artifact
211-
uses: actions/upload-artifact@v3
213+
uses: actions/upload-artifact@v4
212214
with:
213215
name: ${{ steps.package_name.outputs.boost_name }}
214216
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.boost_name }}
215217
- name: Upload Lyra Artifact
216-
uses: actions/upload-artifact@v3
218+
uses: actions/upload-artifact@v4
217219
with:
218220
name: ${{ steps.package_name.outputs.lyra_name }}
219221
path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.lyra_name }}
220222
- name: Upload Environment
221-
uses: actions/upload-artifact@v3
223+
uses: actions/upload-artifact@v4
222224
with:
223225
name: ${{ matrix.name }}.env
224226
path: _package/${{ matrix.name }}/release/sora.env

‎.vscode/c_cpp_properties.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/llvm/libcxx/include",
1313
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/libva/include",
1414
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/vpl/include",
15+
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/blend2d/include",
1516
"${workspaceFolder}/_build/ubuntu-20.04_x86_64/release/sora",
1617
"${workspaceFolder}/third_party/NvCodec/include",
1718
"${workspaceFolder}/third_party/NvCodec/NvCodec",
@@ -46,6 +47,7 @@
4647
"${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/sora",
4748
"${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/rootfs/usr/src/jetson_multimedia_api/include",
4849
"${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/rootfs/usr/src/jetson_multimedia_api/include/libjpeg-8b",
50+
"${workspaceFolder}/_install/ubuntu-20.04_armv8_jetson/release/blend2d/include",
4951
"${workspaceFolder}/_build/ubuntu-20.04_armv8_jetson/release/sora",
5052
"${workspaceFolder}/include"
5153
],
@@ -75,6 +77,7 @@
7577
"${workspaceFolder}/_install/android/release/webrtc/include/third_party/zlib",
7678
"${workspaceFolder}/_install/android/release/llvm/libcxx/include",
7779
"${workspaceFolder}/_install/android/release/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/",
80+
"${workspaceFolder}/_install/android/release/blend2d/include",
7881
"${workspaceFolder}/_build/android/release/sora",
7982
"${workspaceFolder}/include"
8083
],
@@ -104,6 +107,7 @@
104107
"${workspaceFolder}/_install/macos_x86_64/release/webrtc/include/third_party/libyuv/include",
105108
"${workspaceFolder}/_install/macos_x86_64/release/webrtc/include/third_party/zlib",
106109
"${workspaceFolder}/_install/macos_x86_64/release/webrtc/include/sdk/objc",
110+
"${workspaceFolder}/_install/macos_x86_64/release/blend2d/include",
107111
"${workspaceFolder}/_build/macos_x86_64/release/sora",
108112
"${workspaceFolder}/include"
109113
],
@@ -127,6 +131,7 @@
127131
"${workspaceFolder}/_install/windows_x86_64/release/webrtc/include/third_party/boringssl/src/include",
128132
"${workspaceFolder}/_install/windows_x86_64/release/webrtc/include/third_party/libyuv/include",
129133
"${workspaceFolder}/_install/windows_x86_64/release/webrtc/include/third_party/zlib",
134+
"${workspaceFolder}/_install/windows_x86_64/release/blend2d/include",
130135
"${workspaceFolder}/_build/windows_x86_64/release/sora",
131136
"${workspaceFolder}/third_party/NvCodec/include",
132137
"${workspaceFolder}/third_party/NvCodec/NvCodec",
@@ -148,6 +153,7 @@
148153
"includePath": [
149154
"${workspaceFolder}/_install/windows_x86_64/debug/boost/include",
150155
"${workspaceFolder}/_install/windows_x86_64/debug/cuda/nvcc/include",
156+
"${workspaceFolder}/_install/windows_x86_64/debug/blend2d/include",
151157
"${workspaceFolder}/_source/windows_x86_64/debug/webrtc/src",
152158
"${workspaceFolder}/_source/windows_x86_64/debug/webrtc/src/third_party/abseil-cpp",
153159
"${workspaceFolder}/_source/windows_x86_64/debug/webrtc/src/third_party/boringssl/src/include",

‎.vscode/settings.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"python.linting.flake8Enabled": true,
3-
"python.linting.flake8Args": ["--max-line-length=120"],
4-
"python.linting.enabled": true,
5-
"python.formatting.autopep8Args": ["--max-line-length", "120", "--experimental"],
2+
"flake8.args": ["--max-line-length=120"],
3+
"autopep8.args": ["--max-line-length", "120", "--experimental"],
64
"[python]": {
75
"editor.formatOnSave": true,
86
"editor.formatOnSaveMode": "file"

‎CHANGES.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@
1111

1212
## develop
1313

14+
## 2023.17.0 (2023-12-25)
15+
16+
- [UPDATE] WebRTC を `m120.6099.1.2` に上げる
17+
- `m120.6099.1.1` より x86 シミュレータビルドがなくなったため、CI で ios の test ビルドを行わなくした
18+
- @melpon @enm10k @torikizi @miosakuma
19+
1420
## 2023.16.1 (2023-12-02)
1521

16-
- [FIX] WebRTC を m119.6045.2.2 に上げる
17-
- iOS の非公開 API を利用していたため、App Store でリジェクトされてしまうのを修正
22+
- [FIX] WebRTC を `m119.6045.2.2` に上げる
23+
- Apple 非公開 API を利用していたため、Apple からリジェクトされる問題を修正
1824
- @voluntas
1925

2026
## 2023.16.0 (2023-11-19)

0 commit comments

Comments
 (0)