Skip to content

Commit dd7075c

Browse files
committed
⚙️ Resolve git code conflict from rebase.
1 parent a27f840 commit dd7075c

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed
Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,9 @@
11
### 🎉🎊 **New feature**
22
<hr>
33

4-
<<<<<<< HEAD
5-
<<<<<<< HEAD
6-
1. Improve the CI part about parsing and generating version info in reusable workflow.
7-
* as is:
8-
* previous release version value: only ``vx``, i.e., ``v6``.
9-
* to be:
10-
* latest release version value: ``vx`` or ``vx.x``, i.e., ``v6`` or ``v6.2``.
11-
=======
12-
1. Improve the reusable workflow and extract some common logic as new reusable workflows.
13-
* _rw_run_test.yaml_: Extract the logic about matrix values part.
14-
* _rw_run_test_with_multi_py_versions.yaml_: Use matrix to run test with multiple Python versions with different runtime OS.
15-
* _rw_poetry_run_test.yaml_: Extract the logic about matrix values part. (Same with _rw_run_test.yaml_ but use **Poetry**)
16-
* _rw_poetry_run_test_with_multi_py_versions.yaml_: Use matrix to run test with multiple Python versions with different runtime OS. (Same with _rw_run_test_with_multi_py_versions.yaml_ but use **Poetry**)
17-
>>>>>>> 31b852d (Merge pull request #68 from Chisanan232/develop)
18-
=======
194
1. Support verifying with Python versions `3.12` and `3.13`.
20-
>>>>>>> fca711c (🍻 Update the release info for releasing new version.)
215

226
### 🛠⚙️ **Breaking Change**
237
<hr>
248

25-
<<<<<<< HEAD
26-
<<<<<<< HEAD
27-
1. Fix the CI issue about it cannot upload test coverage reports into Action Artifact because they all are hidden files.
28-
* The reusable workflows which would be effected:
29-
* _rw_run_test.yaml_
30-
* _rw_poetry_run_test.yaml_
31-
* _rw_organize_test_cov_reports.yaml_
32-
=======
33-
1. Reusable workflows would ONLY run one Python version with one specific runtime OS.
34-
* The reusable workflows which would be effected:
35-
* _rw_run_test.yaml_
36-
* _rw_poetry_run_test.yaml_
37-
38-
### 🤖⚙️🔧 **Improvement**
39-
<hr>
40-
41-
1. Upgrade the actions in workflow.
42-
* ``actions/checkout``
43-
* ``actions/setup-python``
44-
45-
2. Fix the issue about warning message it should upgrade _pip_.
46-
* Detail error message: ``[notice] A new release of pip is available: 23.0.1 -> 24.0 [notice] To update, run: python3.10 -m pip install --upgrade pip``.
47-
48-
3. Let shell script about combining test coverage reports could be more flexible.
49-
* Remove the limitation of the test type must be ``unit-test``, ``integration-test`` or ``system-test``.
50-
>>>>>>> 31b852d (Merge pull request #68 from Chisanan232/develop)
51-
=======
529
1. Deprecated and won't support verifying with Python versions `3.6` to `3.8`.
53-
>>>>>>> fca711c (🍻 Update the release info for releasing new version.)
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
3-
v6.1.0 🍻🍾 - Fix broken reusable workflow.
4-
=======
5-
v6.0.0 🍻🍾 - Fix some issue and improve reusable workflow to be more flexible.
6-
>>>>>>> 31b852d (Merge pull request #68 from Chisanan232/develop)
7-
=======
81
v7.0.0 🍻🍾 - Support verifying with Python versions `3.12`, `3.13`.
9-
>>>>>>> fca711c (🍻 Update the release info for releasing new version.)

0 commit comments

Comments
 (0)