WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 8e93cf7

Browse files
mkolasinski-splunkartemrysmbruzda-splunk
authored
chore: main to develop sync (#455)
### Description Sync main to develop. ### 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: Artem Rys <[email protected]> Co-authored-by: Marcin Bruzda <[email protected]>
2 parents e429422 + 78b8ef0 commit 8e93cf7

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ on:
3939
required: false
4040
description: "branch for k8s manifests to run the tests on"
4141
type: string
42-
default: "v3.6"
42+
default: "v4.0"
4343
scripted-inputs-os-list:
4444
required: false
4545
description: "list of OS used for scripted input tests"
@@ -57,6 +57,11 @@ on:
5757
description: "Forces WFE tests to run only on the latest Splunk when set to true. When set to false - will run on all supported Splunk versions required for the release. When not set - default behavior."
5858
type: string
5959
default: "false"
60+
python-version:
61+
required: false
62+
description: "Python version to use for testing"
63+
type: string
64+
default: "3.9"
6065
secrets:
6166
GH_TOKEN_ADMIN:
6267
description: Github admin token
@@ -110,7 +115,7 @@ concurrency:
110115
group: ${{ github.head_ref || github.run_id }}
111116
cancel-in-progress: true
112117
env:
113-
PYTHON_VERSION: "3.9"
118+
PYTHON_VERSION: ${{ inputs.python-version }}
114119
POETRY_VERSION: "2.1.4"
115120
POETRY_EXPORT_PLUGIN_VERSION: "1.9.0"
116121
GS_IMAGE_VERSION: "1.0.0"
@@ -494,21 +499,17 @@ jobs:
494499
run: |
495500
if [ -f "poetry.lock" ]
496501
then
497-
python${{ env.PYTHON_VERSION }} -m pip install poetry==${{ env.POETRY_VERSION }} poetry-plugin-export==${{ env.POETRY_EXPORT_PLUGIN_VERSION }}
502+
python${{ env.PYTHON_VERSION }} -m pip install poetry==${{ env.POETRY_VERSION }} poetry-plugin-export==${{ env.POETRY_EXPORT_PLUGIN_VERSION }}
498503
mkdir -p package/lib || true
499504
poetry check --lock
500-
poetry export --without-hashes -o package/lib/requirements.txt
501-
fi
502-
if [ ! -f dev_deps/requirements_dev.txt ]; then
503-
echo "No dev_deps/requirements_dev.txt. Migrate your dependencies to dev_deps/requirements_dev.txt"
504-
exit 1
505-
else
506-
echo "Found dev_deps/requirements_dev.txt. Installing dev dependencies in an isolated environment";
505+
poetry export --without-hashes --with dev -o package/lib/requirements.txt
506+
else
507+
echo "No poetry.lock found, make sure your dependencies are managed through poetry, exiting"
508+
exit 1
507509
fi
508510
git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com
509511
git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf ssh://[email protected]
510512
python${{ env.PYTHON_VERSION }} -m venv ~/.dev_venv
511-
~/.dev_venv/bin/python${{ env.PYTHON_VERSION }} -m pip install -r dev_deps/requirements_dev.txt
512513
~/.dev_venv/bin/python${{ env.PYTHON_VERSION }} -m pip install -r package/lib/requirements.txt
513514
- name: Create directories
514515
run: |
@@ -573,6 +574,8 @@ jobs:
573574
python-version: ${{ env.PYTHON_VERSION }}
574575
- name: create requirements file for pip
575576
run: |
577+
git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf https://github.com
578+
git config --global --add url."https://${{ secrets.GH_TOKEN_ADMIN }}@github.com".insteadOf ssh://[email protected]
576579
if [ -f "poetry.lock" ]
577580
then
578581
echo " poetry.lock found "

0 commit comments

Comments
 (0)