chore: fix conflicts

sgoral-splunk · sgoral-splunk · commit 3f449f79eaf8 · 2024-09-30T12:49:51.000+02:00
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -59,16 +59,10 @@ jobs:
       - uses: pre-commit/action@v3.0.1
 
   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 }}
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -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 <addonfactory@splunk.com>"]
 license = "Apache-2.0"
diff --git a/solnlib/__init__.py b/solnlib/__init__.py
@@ -56,4 +56,4 @@
     "utils",
 ]
 
-__version__ = "5.2.0-beta.2"
+__version__ = "5.2.0"
