Skip to content

Commit f63c2cb

Browse files
siddharth-khatsuriyaharshilgajera-crestkdoroszko-splunkmkolasinski-splunkdkvashninsplunk
authored
Resolve merge conflict (#409)
### Description Resolving develop -> main conflict ### Checklist - [ ] `README.md` has been updated or is not required - [ ] push trigger tests - [ ] manual release test - [ ] automated releases test - [ ] pull request trigger tests - [ ] schedule trigger tests - [ ] workflow errors/warnings reviewed and addressed ### Testing done (for each selected checkbox, the corresponding test results link should be listed here) --------- Co-authored-by: harshilgajera-crest <69803385+harshilgajera-crest@users.noreply.github.com> Co-authored-by: kdoroszko-splunk <kdoroszko@splunk.com> Co-authored-by: mkolasinski-splunk <105011638+mkolasinski-splunk@users.noreply.github.com> Co-authored-by: Dmytro Kvashnin <dkvashnin@splunk.com> Co-authored-by: Dmytro Kvashnin <139753462+dkvashninsplunk@users.noreply.github.com> Co-authored-by: mgrandys-splunk <153620320+mgrandys-splunk@users.noreply.github.com> Co-authored-by: dvarasani-crest <151819886+dvarasani-crest@users.noreply.github.com>
1 parent f4d267f commit f63c2cb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/reusable-build-test-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
- uses: actions/checkout@v4
378378
- uses: actions/setup-python@v5
379379
with:
380-
python-version: "3.7"
380+
python-version: "3.9"
381381
- uses: pre-commit/action@v3.0.1
382382

383383
review_secrets:
@@ -1036,9 +1036,9 @@ jobs:
10361036
run: |
10371037
poetry install --only modinput
10381038
if [ -f "tests/ucc_modinput_functional/tmp/openapi.json" ]; then
1039-
poetry run ucc-test-modinput -o tests/ucc_modinput_functional/tmp/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
1039+
poetry run ucc-test-modinput gen -o tests/ucc_modinput_functional/tmp/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
10401040
else
1041-
poetry run ucc-test-modinput -o ${{ steps.download-openapi.outputs.download-path }}/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
1041+
poetry run ucc-test-modinput gen -o ${{ steps.download-openapi.outputs.download-path }}/openapi.json -t ${{ steps.download-openapi.outputs.download-path }}/tmp/
10421042
fi
10431043
- name: upload-libs-to-s3
10441044
id: upload-libs-to-s3

0 commit comments

Comments
 (0)