Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux x86_64 版のビルドプラットフォームを ubuntu-22.04_x86_64 にあげる #114

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -91,8 +91,8 @@ jobs:
matrix:
name:
- android
- ubuntu-20.04_x86_64
runs-on: ubuntu-20.04
- ubuntu-22.04_x86_64
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Cache
@@ -104,7 +104,7 @@ jobs:
restore-keys: |
${{ matrix.name }}-v1-
- name: Prepare Ubuntu x86_64
if: matrix.name == 'ubuntu-20.04_x86_64'
if: matrix.name == 'ubuntu-22.04_x86_64'
run: |
sudo apt install libgl-dev
- run: python3 run.py ${{ matrix.name }}
@@ -124,18 +124,18 @@ jobs:
path: android/
# Ubuntu 用
- name: Copy Ubuntu x86_64 files
if: matrix.name == 'ubuntu-20.04_x86_64'
if: matrix.name == 'ubuntu-22.04_x86_64'
run: |
mkdir ubuntu-20.04_x86_64/
cp _build/ubuntu-20.04_x86_64/release/sora_unity_sdk/libSoraUnitySdk.so ubuntu-20.04_x86_64/
mkdir ubuntu-22.04_x86_64/
cp _build/ubuntu-22.04_x86_64/release/sora_unity_sdk/libSoraUnitySdk.so ubuntu-22.04_x86_64/
- name: Upload Ubuntu x86_64 Artifact
if: matrix.name == 'ubuntu-20.04_x86_64'
if: matrix.name == 'ubuntu-22.04_x86_64'
uses: actions/upload-artifact@v4
with:
name: ubuntu-20.04_x86_64
path: ubuntu-20.04_x86_64/
name: ubuntu-22.04_x86_64
path: ubuntu-22.04_x86_64/
package:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs:
- build-windows
- build-macos
@@ -164,7 +164,7 @@ jobs:
cp ios/libboost_json.a SoraUnitySdk/Plugins/SoraUnitySdk/ios/
cp ios/libsora.a SoraUnitySdk/Plugins/SoraUnitySdk/ios/
cp ios/libboost_filesystem.a SoraUnitySdk/Plugins/SoraUnitySdk/ios/
cp ubuntu-20.04_x86_64/libSoraUnitySdk.so SoraUnitySdk/Plugins/SoraUnitySdk/linux/x86_64/
cp ubuntu-22.04_x86_64/libSoraUnitySdk.so SoraUnitySdk/Plugins/SoraUnitySdk/linux/x86_64/

cp LICENSE SoraUnitySdk/SoraUnitySdk/
cp NOTICE.md SoraUnitySdk/SoraUnitySdk/
11 changes: 11 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

## develop

- [CHANGE] Linux x86_64 版のビルドを `ubuntu-20.04_x86_64` から `ubuntu-22.04_x86_64` にあげる
- @miosakuma
- [CHANGE] Sora.Config.VideoCodecType を Nullable 型に変更し、デフォルト値を `VP9` から未指定に変更する
- 未指定の場合、シグナリング "type": "connect" でビデオコーデック指定を行わない
- ビデオコーデック指定を行わない場合は Sora のデフォルト値 `VP9` が利用される
@@ -23,6 +25,15 @@
- `CMAKE_VERSION` を `3.31.4` にアップデート
- @torikizi

### misc

- [CHANGE] Linux x86_64 と Android のビルド環境を `ubuntu-20.04` から `ubuntu-22.04` にあげる
- @miosakuma
- [CHANGE] GitHub Actions の package タスクを実行する環境を `ubuntu-20.04` から `ubuntu-22.04` にあげる
- @miosakuma
- [CHANGE] 対応プラットフォームから `Ubuntu 20.04` を削除、 `Ubuntu 22.04` を追加
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

対応プラットフォームの削除は misc ではなく通常の変更履歴に入れておくのが良さそうです

- @miosakuma

## 2025.1.0

**リリース日**: 2025-01-29
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@ Please read https://github.com/shiguredo/oss/blob/master/README.en.md before use
- macOS 13.4.1 M1 以降
- Android 7 以降
- iOS 13 以降
- Ubuntu 20.04 x86_64
- Ubuntu 22.04 x86_64
- Ubuntu 24.04 x86_64

## 対応機能