Skip to content

Commit c43181d

Browse files
authored
Update the CI configuration and resolve the compilation issues. (#1539)
* add username and email for ci * fix the issue with cmake
1 parent 11f7e3a commit c43181d

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

.github/workflows/build_and_test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
- name: Merge base branch
2828
if: ${{ github.event_name == 'pull_request' }}
2929
run: |
30+
git config --global user.name "Paddle2onnxCI"
31+
git config --global user.email "Paddle2onnxCI@example.com"
3032
git fetch origin ${{ github.event.pull_request.base.ref }}
3133
git merge origin/${{ github.event.pull_request.base.ref }}
3234
@@ -71,6 +73,8 @@ jobs:
7173
- name: Merge base branch
7274
if: ${{ github.event_name == 'pull_request' }}
7375
run: |
76+
git config --global user.name "Paddle2onnxCI"
77+
git config --global user.email "Paddle2onnxCI@example.com"
7478
git fetch origin ${{ github.event.pull_request.base.ref }}
7579
git merge origin/${{ github.event.pull_request.base.ref }}
7680
@@ -142,6 +146,8 @@ jobs:
142146
- name: Merge base branch
143147
if: ${{ github.event_name == 'pull_request' }}
144148
run: |
149+
git config --global user.name "Paddle2onnxCI"
150+
git config --global user.email "Paddle2onnxCI@example.com"
145151
git fetch origin ${{ github.event.pull_request.base.ref }}
146152
git merge origin/${{ github.event.pull_request.base.ref }}
147153

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def run(self):
122122
),
123123
]
124124
cmake_args.append("-DCMAKE_BUILD_TYPE=%s" % build_type)
125+
cmake_args.append("-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
125126
if WINDOWS:
126127
cmake_args.extend(
127128
[

0 commit comments

Comments
 (0)