Merge branch 'main' into feature/ucc-as-a-library

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

@@ -232,7 +232,6 @@ jobs:
           path: /tmp/analysis-reports
       - name: Update Notices
         run: cp -f /tmp/analysis-reports/NOTICE_summary NOTICE
-
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v2.5.4
         with:
@@ -241,7 +240,9 @@ jobs:
             @semantic-release/exec
             @semantic-release/git
         env:
-          GITHUB_TOKEN: ${{ secrets.SEMREL_TOKEN }} #
+          GITHUB_TOKEN: ${{ secrets.SEMREL_TOKEN }}
+          PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
   update-semver:
     name: Move Respository semver tags
     if: startsWith(github.ref, 'refs/tags/v')

.github/workflows/sr-prepare.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -eE
+set -v
+source $HOME/.poetry/env
+poetry version $1
+poetry build

.github/workflows/sr-release.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -eE
+set -v
+source $HOME/.poetry/env
+echo pypy user=${PYPI_USERNAME}
+poetry publish -n -u ${PYPI_USERNAME} -p ${PYPI_TOKEN}

.releaserc

@@ -14,13 +14,11 @@
 # limitations under the License.
 #
 {
-  "branches":
+  branches:
     [
       "+([0-9])?(.{+([0-9]),x}).x",
       "main",
-      "next",
-      "next-major",
-      { name: "develop", prerelease: true },
+      { name: "develop", prerelease: "beta", channel: "beta" },
     ],
   plugins:
     [
@@ -29,8 +27,8 @@
       [
         "@semantic-release/exec",
         {
-          "prepareCmd": "source $HOME/.poetry/env ;poetry version ${nextRelease.version}; poetry build",
-          "publishCmd": "source $HOME/.poetry/env ;poetry publish ;poetry publish --build -u $PYPI_USERNAME -p $PYPI_TOKEN",
+          "prepareCmd": "./.github/workflows/sr-prepare.sh ${nextRelease.version}",
+          "publishCmd": "./.github/workflows/sr-release.sh",
           "shell": "bash"
         },
       ],

pyproject.toml

@@ -73,14 +73,9 @@ jsonschema = "^3.2.0"
 [tool.poetry.dev-dependencies]
 pytest = "^6.2"
 pytest-splunk-addon = { version = "^1.6", extras = [ "docker" ] }
-poetry-dynamic-versioning = "^0.13"
 pytest-cov = "^2.12.1"
 coverage = "^5.5"
 
-[tool.poetry-dynamic-versioning]
-enable = true
-format-jinja = "{% if stage == none %}{{ base }}{% else %}{{ base }}.{{ stage[0:3] }}{{ revision }}{% endif %}"
-
 [tool.poetry.scripts]
 ucc-gen="splunk_add_on_ucc_framework:main"
 install-libs="splunk_add_on_ucc_framework:install_requirements"