Skip to content

Commit c7e0836

Browse files
author
jiangpeiling
committed
fix the conflict
2 parents a9facac + 9ab60e3 commit c7e0836

File tree

71 files changed

+3107
-3195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3107
-3195
lines changed

.github/workflows/auto-selenium-test.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/auto-test.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/auto-unit-test.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,26 @@ jobs:
6868
echo "✅ All tests passed successfully."
6969
fi
7070
71-
- name: Upload coverage to Codecov
71+
# Detect architecture
72+
- name: Detect architecture
73+
id: arch
74+
run: echo "arch=$(uname -m)" >> $GITHUB_OUTPUT
75+
76+
# Use Python uploader on ARM
77+
- name: Upload coverage to Codecov (Python uploader on ARM)
78+
if: startsWith(steps.arch.outputs.arch, 'arm') || startsWith(steps.arch.outputs.arch, 'aarch64')
79+
run: |
80+
pip install --upgrade codecov
81+
codecov \
82+
-t ${{ secrets.CODECOV_TOKEN }} \
83+
-f test/coverage.xml \
84+
-F unittests \
85+
-n codecov-umbrella \
86+
-v
87+
88+
# Use official action on x86
89+
- name: Upload coverage to Codecov (Official Action on x86)
90+
if: steps.arch.outputs.arch == 'x86_64'
7291
uses: codecov/codecov-action@v4
7392
with:
7493
files: test/coverage.xml
@@ -77,4 +96,4 @@ jobs:
7796
name: codecov-umbrella
7897
fail_ci_if_error: false
7998
verbose: true
80-
directory: .
99+
directory: .

CONTRIBUTING.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Nexent Contributing Guide ✨
22

3-
[![English](https://img.shields.io/badge/English-README-blue)](CONTRIBUTING.md)
4-
[![中文](https://img.shields.io/badge/中文-README-green)](CONTRIBUTING_CN.md)
5-
63
Thank you for considering contributing to Nexent! From code to docs to sharing your experience, every bit helps make Nexent better for everyone. It also helps us if you share Nexent with others, or simply ⭐️ the repo. Thanks a million! 💛 Let's build something amazing together! 🎉
74

85
In terms of licensing, please take a minute to read our short [License and Contributor Agreement](https://modelengine-group.github.io/nexent/en/license). The community also adheres to the [code of conduct](https://modelengine-group.github.io/nexent/en/code-of-conduct).

CONTRIBUTING_CN.md

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)