Skip to content

Commit

Permalink
chore: fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
sgoral-splunk committed Sep 30, 2024
2 parents 74ce097 + 9cea77b commit 3f449f7
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 26 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,10 @@ jobs:
- uses: pre-commit/[email protected]

semgrep:
runs-on: ubuntu-latest
name: security-sast-semgrep
if: github.actor != 'dependabot[bot]'
steps:
- uses: actions/checkout@v4
- name: Semgrep
id: semgrep
uses: semgrep/semgrep-action@v1
with:
publishToken: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}
uses: splunk/sast-scanning/.github/workflows/sast-scan.yml@main
secrets:
SEMGREP_KEY: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}

run-unit-tests:
name: test-unit ${{ matrix.python-version }}
Expand Down
35 changes: 20 additions & 15 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

[tool.poetry]
name = "solnlib"
version = "5.2.0-beta.2"
version = "5.2.0"
description = "The Splunk Software Development Kit for Splunk Solutions"
authors = ["Splunk <[email protected]>"]
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion solnlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@
"utils",
]

__version__ = "5.2.0-beta.2"
__version__ = "5.2.0"

0 comments on commit 3f449f7

Please sign in to comment.