Merge dev into main

Author: DinisCruz

.github/workflows/ci-pipeline__dev.yml

@@ -0,0 +1,48 @@
+name: CI Pipeline - DEV
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - dev
+
+env:
+  GIT__BRANCH      : 'dev'
+  RELEASE_TYPE     : 'minor'
+  PACKAGE_NAME     : 'osbot_docker'
+
+jobs:
+
+  run-tests:
+    name: "Run tests"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: "run-tests"
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pytest__run-tests@dev
+
+  increment-tag:
+    name: Increment Tag - DEV
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Increment Tag
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__increment-tag@dev
+        with:
+          release_type: ${{ env.RELEASE_TYPE }}
+    needs:
+      - run-tests
+
+  publish-to-pypi:
+    if: False
+    name: "Publish to: PYPI"
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Git Update Current Branch
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__update_branch@dev
+      - name: publish-to-pypi
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pypi__twine__publish@dev
+    needs:
+      - increment-tag

.github/workflows/ci-pipeline__main.yml

@@ -0,0 +1,47 @@
+name : CI Pipeline - Main
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+env:
+  GIT__BRANCH      : 'main'
+  RELEASE_TYPE     : 'major'
+  PACKAGE_NAME     : 'osbot_docker'
+
+jobs:
+
+  run-tests:
+    name: "Run tests"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: "run-tests"
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pytest__run-tests@dev
+
+  increment-tag:
+    name: Increment Tag - Main
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Increment Tag
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__increment-tag@dev
+        with:
+          release_type: ${{ env.RELEASE_TYPE }}
+    needs:
+      - run-tests
+
+  publish-to-pypi:
+    name: "Publish to: PYPI"
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Git Update Current Branch
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/git__update_branch@dev
+      - name: publish-to-pypi
+        uses: owasp-sbot/OSBot-GitHub-Actions/.github/actions/pypi__twine__publish@dev
+    needs:
+      - increment-tag

.github/actions/increment-tag-dev/action.yml renamed to _legacy/.github/actions/increment-tag-dev/action.yml

@@ -0,0 +1,7 @@
+git pull
+git checkout main
+git pull origin main
+git merge --no-ff dev -m "Merge dev into main"
+git push origin main
+git checkout dev
+git merge main -m "Merge main into dev"