Skip to content

Commit e4e26e4

Browse files
Hiroshibayamachu
andauthored
onnxruntimeのバージョンを1.15.1に上げる (#22)
Co-authored-by: Yusuke Yamada <[email protected]>
1 parent 552a900 commit e4e26e4

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
env:
2020
ONNXRUNTIME_VERSION:
2121
|- # releaseタグ名か、workflow_dispatchでのバージョン名が入る。無指定なら適当なバージョン
22-
${{ github.event.release.tag_name || github.event.inputs.version || '1.14.0' }}
22+
${{ github.event.release.tag_name || github.event.inputs.version || '1.15.1' }}
2323
RELEASE:
2424
|- # releaseタグ名か、workflow_dispatchでのreleaseフラグがあればリリースする
2525
${{ github.event.release.tag_name != '' || github.event.inputs.release == 'true' }}
@@ -55,16 +55,19 @@ jobs:
5555
- artifact_name: onnxruntime-ios-arm64
5656
os: macos-12
5757
build_opts: --config Release --parallel --update --build --build_shared_lib --skip_tests --use_xcode --ios --ios_sysroot iphoneos --osx_arch arm64 --apple_deploy_target 16.0
58+
build_opts_workaround_protoc: --path_to_protoc_exe /usr/local/opt/protobuf@21/bin/protoc
5859
result_dir: build/iOS/Release
5960
release_config: Release-iphoneos
6061
- artifact_name: onnxruntime-ios-sim-arm64
6162
os: macos-12
6263
build_opts: --config Release --parallel --update --build --build_shared_lib --skip_tests --use_xcode --ios --ios_sysroot iphonesimulator --osx_arch arm64 --apple_deploy_target 16.0
64+
build_opts_workaround_protoc: --path_to_protoc_exe /usr/local/opt/protobuf@21/bin/protoc
6365
result_dir: build/iOS/Release
6466
release_config: Release-iphonesimulator
6567
- artifact_name: onnxruntime-ios-sim-x86_64
6668
os: macos-12
6769
build_opts: --config Release --parallel --update --build --build_shared_lib --skip_tests --use_xcode --ios --ios_sysroot iphonesimulator --osx_arch x86_64 --apple_deploy_target 16.0
70+
build_opts_workaround_protoc: --path_to_protoc_exe /usr/local/opt/protobuf@21/bin/protoc
6871
result_dir: build/iOS/Release
6972
release_config: Release-iphonesimulator
7073

@@ -106,7 +109,7 @@ jobs:
106109
path: build/
107110
key: ${{ matrix.artifact_name }}-v${{ env.ONNXRUNTIME_VERSION }}-cache-v1-${{ hashFiles('matrix.json') }}
108111

109-
- name: Install build dependencies
112+
- name: Install build dependencies on ubuntu
110113
if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
111114
run: |
112115
sudo apt-get update
@@ -119,11 +122,17 @@ jobs:
119122
g++-${{ matrix.cxx_version }}${{ env.ARCH_SUFFIX }} \
120123
python3
121124
122-
# ONNX Runtime v1.14.1 requires CMake 3.24 or higher.
125+
- name: Install build dependencies on macos
126+
if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'macos')
127+
run: |
128+
# Workaround for protoc https://github.com/microsoft/onnxruntime/issues/16238#issuecomment-1590398821
129+
brew install protobuf@21
130+
131+
# ONNX Runtime v1.15.1 requires CMake 3.26 or higher.
123132
- name: Install CMake
124133
if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
125134
env:
126-
CMAKE_VERSION: 3.24.4
135+
CMAKE_VERSION: 3.26.4
127136
run: |
128137
wget -O cmake.sh "https://github.com/Kitware/CMake/releases/download/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION }}-linux-x86_64.sh"
129138
sudo bash cmake.sh --skip-license --prefix=/usr/local
@@ -153,7 +162,7 @@ jobs:
153162
# skip test: https://github.com/microsoft/onnxruntime/issues/2436
154163
# ONNX Runtime v1.9.0 requires CMAKE_SYSTEM_PROCESSOR, https://github.com/microsoft/onnxruntime/releases/tag/v1.9.0
155164
# Both CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR are required.
156-
bash ./build.sh ${{ matrix.build_opts }}
165+
bash ./build.sh ${{ matrix.build_opts }} ${{ matrix.build_opts_workaround_protoc }}
157166
158167
- name: Organize artifact
159168
run: |

0 commit comments

Comments
 (0)