Skip to content

Commit 15128af

Browse files
committed
another try2
1 parent 05b9df7 commit 15128af

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.github/actions/build/action.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ runs:
4040
run: sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev
4141
shell: ${{ inputs.shell_type }}
4242

43-
44-
4543
# Unreal Engineと合わせたバージョンでMSVCを用意する準備として、始めからある望みでないバージョンを消します。
4644
# 参考: https://github.com/actions/runner-images/issues/9701
4745
- name: Delete components
@@ -75,7 +73,13 @@ runs:
7573
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
7674
shell: ${{ inputs.shell_type }}
7775

78-
76+
- name: Patch libcitygml CMakeLists.txt
77+
run: |
78+
FILE="3rdparty/libcitygml/CMakeLists.txt"
79+
if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then
80+
sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE"
81+
fi
82+
shell: ${{ inputs.shell_type }}
7983

8084
# Windowsのみコンパイラパスを通します。
8185
- name: Add msbuild to PATH
@@ -109,13 +113,6 @@ runs:
109113
run: cmake --build ${{github.workspace}}/out/build/x64-Release-Unity --config ${{env.BUILD_TYPE}}
110114
shell: ${{ inputs.shell_type }}
111115

112-
- name: Patch libcitygml CMakeLists.txt
113-
run: >
114-
FILE="3rdparty/libcitygml/CMakeLists.txt"
115-
if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then
116-
sed -i '' 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)/CMAKE_MINIMUM_REQUIRED(VERSION 3.5)/' "$FILE"
117-
fi
118-
119116
- name: Configure CMake for Unreal for non-Windows
120117
if: runner.os != 'Windows'
121118
run: >

0 commit comments

Comments
 (0)