Merge pull request #11 from SolaceLabs/ci_imporvements

Include web_visualizer into build wheel

Author: artyom-morozov

.github/workflows/ci.yaml

@@ -73,7 +73,7 @@ jobs:
           pip install virtualenv
 
       - name: Run Whitesource Scan
-        if: ${{ github.repository_owner == 'SolaceLabs' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         uses: SolaceDev/solace-public-workflows/.github/actions/whitesource-scan@main
         with:
           whitesource_product_name: ${{ env.WS_PRODUCT_NAME}}
@@ -82,7 +82,7 @@ jobs:
           whitesource_config_file: wss-unified-agent.config
 
       - name: Run WhiteSource Policy Gate
-        if: ${{ github.repository_owner == 'SolaceLabs' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         uses: docker://ghcr.io/solacedev/maas-build-actions:latest
         env:
           WS_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
@@ -102,7 +102,7 @@ jobs:
             "
 
       - name: Run WhiteSource Vulnerability Gate
-        if: ${{ github.repository_owner == 'SolaceLabs' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         uses: docker://ghcr.io/solacedev/maas-build-actions:latest
         continue-on-error: true
         env:

.github/workflows/release.yml

@@ -47,25 +47,54 @@ jobs:
         uses: SolaceDev/solace-public-workflows/.github/actions/hatch-setup@main
 
       - name: Get Current Version
+        id: current_version
         run: |
           CURRENT_VERSION=$(hatch version)
           echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
 
-      - name: Fail if the current version doesn't exist
-        if: env.CURRENT_VERSION == ''
-        run: exit 1
+      - name: Check if last commit was a version bump commit
+        id: check_bump
+        run: |
+          LAST_COMMIT_MSG=$(git log -1 --pretty=%B)
+          echo "Last commit: $LAST_COMMIT_MSG"
+          if echo "$LAST_COMMIT_MSG" | grep -q "\[ci skip\] Bump version to"; then
+              echo "Previous commit was a version bump. Skipping version bump."
+              echo "SKIP_BUMP=1" >> $GITHUB_ENV
+          else
+              echo "SKIP_BUMP=0" >> $GITHUB_ENV
+          fi
 
       - name: Bump Version
+        id: bump_version
         run: |
-          hatch version "${{ github.event.inputs.version }}"
-          NEW_VERSION=$(hatch version)
-          echo "NEW_VERSION=${NEW_VERSION}" >> $GITHUB_ENV
+          if [ "$SKIP_BUMP" = "1" ]; then
+              echo "Skipping version bump as the last commit was a version bump."
+              echo "NEW_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
+          else
+              if [ -n "${{ github.event.inputs.full_version }}" ]; then
+                  if [[ "${{ github.event.inputs.full_version }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+                      hatch version "${{ github.event.inputs.full_version }}"
+                  else
+                      echo "Invalid full_version provided: ${{ github.event.inputs.full_version }}. Expected format x.y.z."
+                      exit 1
+                  fi
+              else
+                  hatch version "${{ github.event.inputs.version }}"
+              fi
+              NEW_VERSION=$(hatch version)
+              echo "NEW_VERSION=${NEW_VERSION}" >> $GITHUB_ENV
+          fi
+
+      - name: Fail if the current version doesn't exist
+        if: env.CURRENT_VERSION == ''
+        run: exit 1
 
       - name: Commit new version
+        if: ${{ env.SKIP_BUMP == '0' }}
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
-          git commit -a -m "[ci skip] Bump version to $NEW_VERSION"
+          git commit -a -m "[ci skip] Bump version to ${NEW_VERSION}"
           git push
 
       - name: Build project for distribution

pyproject.toml

@@ -67,24 +67,21 @@ homepage = "https://github.com/SolaceLabs/solace-agent-mesh"
 repository = "https://github.com/SolaceLabs/solace-agent-mesh"
 documentation = "https://github.com/SolaceLabs/solace-agent-mesh/blob/main/docs/docs/index.md"
 
-[tool.hatch.metadata]
-allow-direct-references = true
-
 [tool.hatch.build.targets.wheel.force-include]
 "src" = "solace_agent_mesh/"
 "configs" = "solace_agent_mesh/configs"
 "templates" = "solace_agent_mesh/templates"
 "cli" = "solace_agent_mesh/cli"
+"web-visualizer/dist" = "solace_agent_mesh/assets/web-visualizer"
 
 [tool.hatch.build.targets.sdist.force-include]
-"web-visualizer/dist" = "solace_agent_mesh/assets/web-visualizer"
+"web-visualizer/dist" = "/assets/web-visualizer"
 
 [project.scripts]
 solace-agent-mesh = "solace_agent_mesh.cli.main:main"
 sam = "solace_agent_mesh.cli.main:main"
 
 [tool.hatch.build.targets.wheel]
-require-runtime-dependencies = true
 packages = ["solace_agent_mesh"]