Skip to content

Commit

Permalink
Merge branch 'devo-v2_enh' of github.com:metron-labs/content into dev…
Browse files Browse the repository at this point in the history
…o-v2_enh
  • Loading branch information
manas-metron committed Feb 2, 2024
2 parents d07844a + 8dfc4a3 commit 9e0a45a
Show file tree
Hide file tree
Showing 108 changed files with 6,418 additions and 672 deletions.
1 change: 1 addition & 0 deletions .github/workflows/clean_stale_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:
jobs:
stale:
runs-on: ubuntu-latest
if: github.repository == 'demisto/content' && github.event.pull_request.head.repo.fork == false
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
15 changes: 15 additions & 0 deletions .gitlab/ci/.gitlab-ci.on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,21 @@ validate-content-conf:
- cp "./Tests/conf.json" "${ARTIFACTS_FOLDER_SERVER_TYPE}/conf.json"
- section_end "Copy conf.json To Server Type Artifacts Folder"

- section_start "Find dependencies changes" --collapsed
- |
if [[ -z $BUCKET_UPLOAD || $TEST_UPLOAD == "false" ]]; then
source ./Tests/scripts/get_previous_master_sha.sh
if [[ -z $PREVIOUS_MASTER_SHA ]]; then
echo "WARNING: failed to detect previous master SHA, skipping find dependencies changes"
else
echo "Finding pack dependencies diff against $PREVIOUS_MASTER_SHA"
python Tests/scripts/find_pack_dependencies_changes.py --gitlab-token $GITLAB_API_TOKEN --master-sha $PREVIOUS_MASTER_SHA --job-name $CI_JOB_NAME --artifacts-folder "$ARTIFACTS_FOLDER_SERVER_TYPE"
fi
else
echo "Test upload flow - skipping find dependencies changes"
fi
- section_end "Find dependencies changes"

- section_start "Replace Cortex XSOAR" --collapsed
- |
if [[ $MARKETPLACE_VERSION == "marketplacev2" || $MARKETPLACE_VERSION == "xpanse" ]];
Expand Down
6 changes: 5 additions & 1 deletion .hooks/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ else
if [[ "${should_install_poetry}" == "yes" ]]; then
echo "Installing Poetry version:${POETRY_VERSION}"
curl -sSL https://install.python-poetry.org | python3 - --version "${POETRY_VERSION}"
exit_on_error $? "Failed to install Poetry version:${POETRY_VERSION}"
error_code=$?
if ! command -v poetry >/dev/null 2>&1; then
exit_on_error $? "Poetry isn't installed"
fi
Expand All @@ -81,6 +81,10 @@ else
else
exit_on_error 1 "Poetry version $(poetry --version) doesn't match the required version: ${POETRY_VERSION}"
fi
if [ -n "${ARTIFACTS_FOLDER}" ] && [ "${error_code}" -ne 0 ]; then
cp ${PWD}/poetry-installer-error-*.log "${ARTIFACTS_FOLDER}"
fi
exit_on_error $error_code "Failed to install Poetry version:${POETRY_VERSION}"
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ repos:
- decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.11"
- defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.11"
- demisto-py==3.2.13 ; python_version >= "3.8" and python_version < "3.11"
- demisto-sdk==1.26.0 ; python_version >= "3.8" and python_version < "3.11"
- demisto-sdk==1.26.1 ; python_version >= "3.8" and python_version < "3.11"
- dictdiffer==0.9.0 ; python_version >= "3.8" and python_version < "3.11"
- dictor==0.1.12 ; python_version >= "3.8" and python_version < "3.11"
- distlib==0.3.7 ; python_version >= "3.8" and python_version < "3.11"
Expand Down
Empty file.
Empty file.
Loading

0 comments on commit 9e0a45a

Please sign in to comment.