Merge pull request #38 from shiguredo/feature/ubuntu-24.04

Ubuntu 24.04 に対応して Ubuntu 20.04 を削除する
shiguredo · Jun 23, 2024 · 34f1ecb · 34f1ecb
2 parents 1599ef6 + cf5bbda
commit 34f1ecb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,28 +16,15 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - ubuntu-20.04_x86_64
           - ubuntu-22.04_x86_64
+          - ubuntu-24.04_x86_64
     name: Build zakuro for ${{ matrix.name }}
-    runs-on: ${{ matrix.name == 'ubuntu-22.04_x86_64' && 'ubuntu-22.04' || 'ubuntu-20.04' }}
+    runs-on: ${{ matrix.name == 'ubuntu-24.04_x86_64' && 'ubuntu-24.04' || 'ubuntu-22.04' }}
     steps:
       - uses: actions/checkout@v4
-      - name: Update repo
-        if: matrix.name == 'ubuntu-22.04_x86_64'
-        run: |
-          # 標準のリポジトリだと mesa-va-drivers パッケージが無い（404 NotFound）というエラーを出されてしまうので、
-          # CUDA のリポジトリを追加してインストール可能にする
-          sudo apt-get update
-          sudo apt-get install -y software-properties-common
-          # CUDA 10 なので ubuntu1804 で正しい
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
-          sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
-          sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
-          sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
-          sudo apt-get update
       - name: Install deps
         run: |
-          DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libva-dev libdrm-dev
+          DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libva-dev libdrm-dev libx11-dev libxext-dev
       - run: python3 run.py ${{ matrix.name }} --package
       - name: Get package name
         shell: bash
@@ -65,10 +52,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/download
         with:
-          platform: ubuntu-20.04_x86_64
+          platform: ubuntu-22.04_x86_64
       - uses: ./.github/actions/download
         with:
-          platform: ubuntu-22.04_x86_64
+          platform: ubuntu-24.04_x86_64
       - name: Env to output
         run: |
           echo "package_paths<<EOF" >> $GITHUB_OUTPUT

diff --git a/CHANGES.md b/CHANGES.md
@@ -15,13 +15,17 @@
   - @melpon
 - [CHANGE] `--webrtc-build-dir`, `--webrtc-build-args` を `--local-webrtc-build-dir` と `--local-webrtc-build-args` に変更する
   - @melpon
+- [CHANGE] Ubuntu 20.04 のビルドを削除
+  - @melpon
 - [UPDATE] Sora C++ SDK を 2024.7.0-canary.4 に上げる
   - それに伴って以下のライブラリのバージョンも上げる
   - libwebrtc のバージョンを `m125.6422.2.5` に上げる
   - Boost のバージョンを `1.85.0` に上げる
   - @melpon
 - [UPDATE] Blend2D, AsmJit を最新版に上げる
   - @melpon
+- [ADD] Ubuntu 24.04 のビルドを追加
+  - @melpon
 
 ## 2024.1.0 (2024-04-24)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Blend2D REQUIRED)
 find_package(CLI11 REQUIRED)
 find_package(yaml-cpp REQUIRED)
 
-if (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64")
+if (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-24.04_x86_64")
   find_package(Libva REQUIRED)
   find_package(Libdrm REQUIRED)
 endif()
@@ -148,7 +148,7 @@ foreach(n RANGE ${RESOURCE_FILES_LENGTH_MINUS_ONE})
   # バイナリの組み込み
   if (ZAKURO_PLATFORM STREQUAL "macos_arm64")
     target_link_options(zakuro PRIVATE "SHELL:-sectcreate __DATA ${file_name_macos} ${CMAKE_CURRENT_SOURCE_DIR}/resource/${file}")
-  elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64")
+  elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-24.04_x86_64")
     set(objfile ${file}.o)
     add_custom_command(OUTPUT ${objfile}
       COMMAND ld
@@ -185,5 +185,5 @@ if (ZAKURO_PLATFORM STREQUAL "macos_arm64")
   target_link_options(zakuro PRIVATE -ObjC)
   set_target_properties(zakuro PROPERTIES CXX_VISIBILITY_PRESET hidden)
 
-elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64")
+elseif (ZAKURO_PLATFORM STREQUAL "ubuntu-20.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-22.04_x86_64" OR ZAKURO_PLATFORM STREQUAL "ubuntu-24.04_x86_64")
 endif()
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 ZAKURO_VERSION=2024.1.0
-SORA_CPP_SDK_VERSION=2024.7.0-canary.3
+SORA_CPP_SDK_VERSION=2024.7.0-canary.4
 WEBRTC_BUILD_VERSION=m125.6422.2.5
 BOOST_VERSION=1.85.0
 CLI11_VERSION=v2.4.2

diff --git a/run.py b/run.py
@@ -40,7 +40,7 @@
 def get_common_cmake_args(install_dir, platform, webrtc_info: WebrtcInfo):
     # クロスコンパイルの設定。
     # 本来は toolchain ファイルに書く内容
-    if platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64"):
+    if platform in ("ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"):
         return [
             f"-DCMAKE_C_COMPILER={webrtc_info.clang_dir}/bin/clang",
             f"-DCMAKE_CXX_COMPILER={webrtc_info.clang_dir}/bin/clang++",
@@ -112,7 +112,7 @@ def install_deps(
         webrtc_info = get_webrtc_info(platform, local_webrtc_build_dir, install_dir, debug)
 
         if (
-            platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64")
+            platform in ("ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64")
             and local_webrtc_build_dir is None
         ):
             webrtc_version = read_version_file(webrtc_info.version_file)
@@ -159,7 +159,7 @@ def install_deps(
             "platform": "",
             "ext": "tar.gz",
         }
-        if platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64"):
+        if platform in ("ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"):
             install_cmake_args["platform"] = "linux-x86_64"
         elif platform == "macos_arm64":
             install_cmake_args["platform"] = "macos-universal"
@@ -231,7 +231,7 @@ def install_deps(
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "target", choices=["macos_arm64", "ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64"]
+        "target", choices=["macos_arm64", "ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"]
     )
     parser.add_argument("--debug", action="store_true")
     parser.add_argument("--relwithdebinfo", action="store_true")