Skip to content

Commit 983206d

Browse files
committed
⚙️ Resolve git code conflict.
2 parents 1ea44f0 + d84ac66 commit 983206d

14 files changed

+19
-20
lines changed

.gitcommitrules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ invalid message format should not be merged or fetched, etc.
99
Format:
1010
[commit topic] (commit scope) <commit message>
1111

12-
1312
Commit Topic:
1413
* New Feature
1514
The new features which be added currently.

.github/workflows/ci-cd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
RELEASE_TYPE: ${{ needs.build_git-tag_and_create_github-release.outputs.github-action_reusable_workflow_release_version }}
3434
DEBUG_MODE: false
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737

3838
- name: Check it whether get the output of previous one job which has version info or not
3939
run: bash scripts/ci/check_getting_output.sh

.github/workflows/rw_build_git-tag_and_create_github-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
matrix_github_action_reusable_workflow: ${{ steps.github_action_reusable_workflow_release.outputs.release_version }}
7373
steps:
7474
- name: Checkout
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676

7777
- name: Download shell script for checking input parameters
7878
run: curl https://raw.githubusercontent.com/Chisanan232/GitHub-Action_Reusable_Workflows-Python/develop/scripts/ci/build_git-tag_or_create_github-release.sh --output ./scripts/ci/build_git-tag_or_create_github-release.sh

.github/workflows/rw_get_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
outputs:
4747
matrix: ${{ steps.set-matrix.outputs.all_test_items }}
4848
steps:
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050

5151
- name: Download shell script for getting path of all test modules
5252
if: ${{ inputs.use_customized_shell != true }}

.github/workflows/rw_organize_test_cov_reports.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: Download code coverage result file
3737
uses: actions/download-artifact@v3
@@ -40,7 +40,7 @@ jobs:
4040
path: ./
4141

4242
- name: Setup Python 3.10 in Ubuntu OS
43-
uses: actions/setup-python@v4
43+
uses: actions/setup-python@v5
4444
with:
4545
python-version: '3.10'
4646

.github/workflows/rw_poetry_run_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ jobs:
8787
test-path: ${{fromJson(inputs.all_test_items_paths)}}
8888

8989
steps:
90-
- uses: actions/checkout@v3
90+
- uses: actions/checkout@v4
9191

9292
- name: Install Python ${{ inputs.python_version }}
93-
uses: actions/setup-python@v4
93+
uses: actions/setup-python@v5
9494
with:
9595
python-version: ${{ inputs.python_version }}
9696

.github/workflows/rw_pre-building_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
runs-on: ubuntu-latest
5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v3
53+
uses: actions/checkout@v4
5454

5555
- name: Setup Python 3.10 in Ubuntu OS
56-
uses: actions/setup-python@v4
56+
uses: actions/setup-python@v5
5757
with:
5858
python-version: '3.10'
5959

.github/workflows/rw_push_pypi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Setup Python 3.10 in Ubuntu OS
61-
uses: actions/setup-python@v4
61+
uses: actions/setup-python@v5
6262
with:
6363
python-version: '3.10'
6464

.github/workflows/rw_run_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ jobs:
8383
test-path: ${{fromJson(inputs.all_test_items_paths)}}
8484

8585
steps:
86-
- uses: actions/checkout@v3
86+
- uses: actions/checkout@v4
8787

8888
- name: Install Python ${{ inputs.python_version }}
89-
uses: actions/setup-python@v4
89+
uses: actions/setup-python@v5
9090
with:
9191
python-version: ${{ inputs.python_version }}
9292

.github/workflows/rw_sonarqube_scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
upload_test_cov_report:
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
with:
4141
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
4242

0 commit comments

Comments
 (0)