Skip to content

Commit

Permalink
Merge branch 'develop' into support/hololens2
Browse files Browse the repository at this point in the history
  • Loading branch information
melpon committed Aug 29, 2024
2 parents 81cb97f + 7928091 commit 9863dba
Show file tree
Hide file tree
Showing 15 changed files with 2,275 additions and 994 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- name: Cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: _install
key: ${{ matrix.name }}-v4-${{ hashFiles('VERSIONS') }}
Expand All @@ -35,7 +35,7 @@ jobs:
# ソースコード(生成した分も含む)も一緒に入れておく
Copy-Item -Recurse Sora ${{ matrix.name }}\Sora
- name: Upload ${{ matrix.name }} Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.name }}
path: ${{ matrix.name }}
Expand All @@ -46,12 +46,12 @@ jobs:
name:
- macos_arm64
- ios
runs-on: macos-12
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: _install
key: ${{ matrix.name }}-v7-${{ hashFiles('VERSIONS') }}
Expand All @@ -66,7 +66,7 @@ jobs:
cp -r _build/macos_arm64/release/sora_unity_sdk/SoraUnitySdk.bundle/ macos_arm64/SoraUnitySdk.bundle/
- name: Upload macOS arm64 Artifact
if: matrix.name == 'macos_arm64'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macos_arm64
path: macos_arm64/
Expand All @@ -82,7 +82,7 @@ jobs:
cp _build/ios/release/sora_unity_sdk/libSoraUnitySdk.a ios/
- name: Upload iOS Artifact
if: matrix.name == 'ios'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ios
path: ios/
Expand All @@ -98,7 +98,7 @@ jobs:
- uses: actions/checkout@v4
- name: Cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: _install
key: ${{ matrix.name }}-v1-${{ hashFiles('VERSIONS') }}
Expand All @@ -115,10 +115,11 @@ jobs:
run: |
mkdir android/
cp _install/android/release/webrtc/jar/webrtc.jar android/
cp _install/android/release/sora/lib/Sora.aar android/
cp _build/android/release/sora_unity_sdk/libSoraUnitySdk.so android/
- name: Upload Android Artifact
if: matrix.name == 'android'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: android
path: android/
Expand All @@ -130,7 +131,7 @@ jobs:
cp _build/ubuntu-20.04_x86_64/release/sora_unity_sdk/libSoraUnitySdk.so ubuntu-20.04_x86_64/
- name: Upload Ubuntu x86_64 Artifact
if: matrix.name == 'ubuntu-20.04_x86_64'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ubuntu-20.04_x86_64
path: ubuntu-20.04_x86_64/
Expand All @@ -143,7 +144,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
- name: Packaging
run: |
set -ex
Expand All @@ -160,6 +161,7 @@ jobs:
cp -r macos_arm64/SoraUnitySdk.bundle SoraUnitySdk/Plugins/SoraUnitySdk/macos/arm64/SoraUnitySdk.bundle
cp android/libSoraUnitySdk.so SoraUnitySdk/Plugins/SoraUnitySdk/android/arm64-v8a/
cp android/webrtc.jar SoraUnitySdk/Plugins/SoraUnitySdk/android/
cp android/Sora.aar SoraUnitySdk/Plugins/SoraUnitySdk/android/
cp ios/libSoraUnitySdk.a SoraUnitySdk/Plugins/SoraUnitySdk/ios/
cp ios/libwebrtc.a SoraUnitySdk/Plugins/SoraUnitySdk/ios/
cp ios/libboost_json.a SoraUnitySdk/Plugins/SoraUnitySdk/ios/
Expand All @@ -171,7 +173,7 @@ jobs:
cp NOTICE.md SoraUnitySdk/SoraUnitySdk/
- name: Upload SoraUnitySdk
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SoraUnitySdk
path: SoraUnitySdk
Expand All @@ -184,7 +186,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Download SoraUnitySdk
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: SoraUnitySdk
path: SoraUnitySdk
Expand Down
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["charliermarsh.ruff", "ms-python.mypy-type-checker"]
}
232 changes: 118 additions & 114 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,115 +1,119 @@
{
"[cpp]": {
"editor.formatOnSave": true,
},
"files.associations": {
"*.cs": "csharp",
"CMakeLists.txt": "cmake",
"memory": "cpp",
"utility": "cpp",
"xmemory": "cpp",
"thread": "cpp",
"algorithm": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"csetjmp": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"execution": "cpp",
"resumable": "cpp",
"filesystem": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory_resource": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"scoped_allocator": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string": "cpp",
"strstream": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"valarray": "cpp",
"variant": "cpp",
"vector": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"*.ipp": "cpp",
"hash_map": "cpp",
"hash_set": "cpp",
"bit": "cpp",
"coroutine": "cpp",
"format": "cpp",
"ranges": "cpp",
"source_location": "cpp",
"span": "cpp",
"stop_token": "cpp"
}
{
"python.analysis.autoImportCompletions": true,
"python.analysis.typeCheckingMode": "basic",
"[python]": {
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.autoIndent": "full",
"editor.codeActionsOnSave": {
"source.fixAll.ruff": "always",
"source.organizeImports.ruff": "explicit"
}
},
"[cpp]": {
"editor.formatOnSave": true,
},
"files.associations": {
"*.cs": "csharp",
"memory": "cpp",
"utility": "cpp",
"xmemory": "cpp",
"thread": "cpp",
"algorithm": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"csetjmp": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"execution": "cpp",
"resumable": "cpp",
"filesystem": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory_resource": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"scoped_allocator": "cpp",
"set": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string": "cpp",
"strstream": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"valarray": "cpp",
"variant": "cpp",
"vector": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"*.ipp": "cpp",
"hash_map": "cpp",
"hash_set": "cpp"
}
}
Loading

0 comments on commit 9863dba

Please sign in to comment.