Merge pull request #302 from AikidoSec/AIK-4311

AIK-4311 Automatically replace version number before release

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       run: |
           sudo echo "127.0.0.1 local.aikido.io" | sudo tee -a /etc/hosts
     - name: Installation
-      run: make install
+      run: make dev_install
     - name: Run Pylint
       run: |
         poetry run pylint --fail-under=9 --rcfile=.pylintrc aikido_zen/
@@ -48,6 +48,10 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install poetry
       run: pip install poetry
+    - name: Set the version for this release
+      run: |
+        TAG_NAME=${GITHUB_REF##*/}
+        make replace_version version=${TAG_NAME#v}
     - name: Download binaries & build
       run: make build
     - name: Publish to PyPI

.github/workflows/test-publish.yml

@@ -18,7 +18,7 @@ jobs:
       run: |
           sudo echo "127.0.0.1 local.aikido.io" | sudo tee -a /etc/hosts
     - name: Installation
-      run: make install
+      run: make dev_install
     - name: Run Pylint
       run: |
         poetry run pylint --fail-under=9 --rcfile=.pylintrc aikido_zen/
@@ -49,6 +49,10 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install poetry
       run: pip install poetry
+    - name: Set the version for this release
+      run: |
+        TAG_NAME=${GITHUB_REF##*/}
+        make replace_version version=${TAG_NAME#dev-v}
     - name: Install dependencies
       run: poetry install
     - name: Download binaries & build

Makefile

@@ -71,3 +71,16 @@ check_binaries:
 		echo "Directory $(CACHE_DIR) is empty. Running 'make binaries'..."; \
 		$(MAKE) binaries; \
 	fi
+
+
+# Replace version number automatically on publish :
+VERSION_FILES = ./build.gradle ./agent_api/src/main/java/dev/aikido/agent_api/Config.java
+replace_version:
+	@if [ -z "$(version)" ]; then \
+		echo "Error: No version specified. Use 'make replace_version version=<new_version>'."; \
+		exit 1; \
+	fi;
+
+	poetry version $(version)
+	sed -i.bak "s/1.0-REPLACE-VERSION/$$version/g" aikido_zen/config.py
+	rm aikido_zen/config.py.bak

aikido_zen/config.py

@@ -1,3 +1,3 @@
 """Contains package versions"""
 
-PKG_VERSION = "1.1.1"
+PKG_VERSION = "1.0-REPLACE-VERSION"

aikido_zen/context/users_test.py

@@ -1,5 +1,3 @@
-from lib2to3.fixes.fix_input import context
-
 import pytest
 
 from . import current_context, Context

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aikido_zen"
-version = "1.1.1"
+version = "1.0.0"
 description = "Aikido Zen for Python"
 authors = ["Aikido Security <help@aikido.dev>"]
 readme = "README.md"