Skip to content

Commit 5e5641f

Browse files
linoallinoal
authored
GitHub ActionsのUbuntuバージョンを変更 (#276)
* GitHub ActionsのUbuntuバージョンを変更 * 同上 * 同上 * GLTF SDKアプデ * include追加 * 同上 * 微修正 * プルリク指摘に対応
1 parent 01acd8b commit 5e5641f

File tree

8 files changed

+13
-20
lines changed

8 files changed

+13
-20
lines changed

‎.github/actions/build/action.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ runs:
8989
echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV
9090
shell: ${{ inputs.shell_type }}
9191

92-
# Linuxで使うコンパイラを明示
93-
- name: Setup Additional Cmake Options in Linux
94-
if: runner.os == 'Linux'
95-
run: |
96-
echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=\"/usr/bin/g++-9\"" >> $GITHUB_ENV
97-
shell: ${{ inputs.shell_type }}
98-
# Ubuntu 18 だとデフォルトでは g++-7 になりますが、std::filesystem を使う都合上 g++-9 を指定します。
99-
10092
- name: Configure CMake for Unity
10193
run: >
10294
cmake

‎.github/workflows/build-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
arch: x86_64
2525
- os: macos-14
2626
arch: arm64
27-
- os: ubuntu-20.04
27+
- os: ubuntu-24.04 # Unity LTSの対応バージョンに合わせておきます
2828
arch: x86_64
2929

3030
steps:

‎.github/workflows/check-submodule-license.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515

1616
jobs:
1717
check-submodule-license:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-24.04
1919

2020
steps:
2121

‎.github/workflows/upload-dlls-older-visual-studio.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [windows-2019, macos-14, ubuntu-20.04]
23+
os: [windows-2019, macos-14, ubuntu-24.04] # UbuntuはUnity LTSの対応バージョンに合わせておきます
2424
arch: [x86_64]
2525
include:
2626
- os: macos-14
@@ -43,7 +43,7 @@ jobs:
4343
uses: ./.github/actions/upload-dll
4444
with:
4545
shell_type: ${{ (runner.os == 'Windows' && 'powershell') || 'bash' }}
46-
visual_studio_version: "16 2019"
46+
visual_studio_version: "17 2022"
4747

4848
# 2つ目のジョブ。
4949
# AndroidとiOS用にライブラリをビルド。
@@ -98,7 +98,7 @@ jobs:
9898
mkdir -p ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework
9999
cp ~/a/libplateau-windows/plateau.dll ~/a/plateau-plugins/dynamic-libs/Windows/x86_64
100100
cp ~/a/libplateau-windows/CSharpPLATEAU.dll ~/a/plateau-plugins/dynamic-libs/ManagedDLL
101-
cp ~/a/libplateau-ubuntu-20.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
101+
cp ~/a/libplateau-ubuntu-24.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
102102
cp ~/a/libplateau-macos-14-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
103103
cp ~/a/libplateau-macos-14-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
104104
cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android
@@ -110,7 +110,7 @@ jobs:
110110
mkdir -p ~/a/plateau-plugins/static-libs/linux
111111
mkdir -p ~/a/plateau-plugins/static-libs/macos
112112
cp ~/a/libplateau-windows/*.lib ~/a/plateau-plugins/static-libs/windows
113-
cp ~/a/libplateau-ubuntu-20.04/*.a ~/a/plateau-plugins/static-libs/linux
113+
cp ~/a/libplateau-ubuntu-24.04/*.a ~/a/plateau-plugins/static-libs/linux
114114
cp ~/a/libplateau-macos-14-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64
115115
cp ~/a/libplateau-macos-14-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64
116116

‎.github/workflows/upload-dlls.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
os: [windows-2022, macos-14, ubuntu-20.04]
26+
os: [windows-2022, macos-14, ubuntu-24.04] # UbuntuはUnity LTSの対応バージョンに合わせておきます
2727
arch: [x86_64]
2828
include:
2929
- os: macos-14
@@ -101,7 +101,7 @@ jobs:
101101
mkdir -p ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework
102102
cp ~/a/libplateau-windows/plateau.dll ~/a/plateau-plugins/dynamic-libs/Windows/x86_64
103103
cp ~/a/libplateau-windows/CSharpPLATEAU.dll ~/a/plateau-plugins/dynamic-libs/ManagedDLL
104-
cp ~/a/libplateau-ubuntu-20.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
104+
cp ~/a/libplateau-ubuntu-24.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
105105
cp ~/a/libplateau-macos-14-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
106106
cp ~/a/libplateau-macos-14-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
107107
cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android
@@ -114,7 +114,7 @@ jobs:
114114
mkdir -p ~/a/plateau-plugins/static-libs/macos/x86_64
115115
mkdir -p ~/a/plateau-plugins/static-libs/macos/arm64
116116
cp ~/a/libplateau-windows/*.lib ~/a/plateau-plugins/static-libs/windows
117-
cp ~/a/libplateau-ubuntu-20.04/*.a ~/a/plateau-plugins/static-libs/linux
117+
cp ~/a/libplateau-ubuntu-24.04/*.a ~/a/plateau-plugins/static-libs/linux
118118
cp ~/a/libplateau-macos-14-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64
119119
cp ~/a/libplateau-macos-14-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64
120120

‎3rdparty/glTF-SDK/glTF-SDK‎

Submodule glTF-SDK updated 97 files

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ fbx_sdk は Autodesk社が公開するSDKです。これは自由に製品に組
129129
* C#ユニットテストも合わせて実行可能です。
130130

131131
### Linuxでの手動ビルド
132-
利用する Linux は、Unityの対応OSに合わせて Ubuntu 20.04 とします。
132+
利用する Linux は、Unityの対応OSに合わせて Ubuntu 24.04 とします。
133133
#### C++のビルド
134-
* Ubuntu 20 はデフォルトでは git lfs がないので、`sudo apt install git-lfs` します。
134+
* Ubuntuでgit lfsを使うために`sudo apt install git-lfs` します。
135135
* OpenGL API が必要なので、なければ以下のコマンドでインストールします。
136136
```
137137
sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev

‎include/plateau/dataset/city_model_package.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <string>
4+
#include <cstdint>
45

56
namespace plateau::dataset {
67
/**

0 commit comments

Comments
 (0)