Merged in feature/PROTO-242-Dynamic-version-numbering-for-development…

…-builds-v4 (pull request #178) Feature/PROTO-242 Dynamic version numbering for development builds v4
Embedded-AMS · Aug 29, 2024 · d53ef4b · d53ef4b
2 parents 02b4578 + b7aced0
commit d53ef4b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/distribute_pypi.yml b/.github/workflows/distribute_pypi.yml
@@ -4,14 +4,15 @@ on:
   push:
     branches:
       - 'develop-v4'
+      - 'feature/**'
 
 jobs:
   build:
     name: Build distribution 📦
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        protoc-version: ["25.x"]
+        protoc-version: ["27.x"]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/version.json → EmbeddedProto/version.json b/version.json → EmbeddedProto/version.json
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,7 @@ include = ["EmbeddedProto*"]
 protoc-gen-eams = "EmbeddedProto.main:main_plugin"
 
 [tool.setuptools.package-data]
-EmbeddedProto = ["templates/*"]
+EmbeddedProto = ["templates/*", "version.json"]
 
 [build-system]
 requires = ["setuptools>=64"]

diff --git a/setup.py b/setup.py
@@ -64,7 +64,7 @@ def run(self):
         super().run()
 
 def get_version():
-    version_file = 'version.json'
+    version_file = 'EmbeddedProto/version.json'
     build_number = os.getenv('GITHUB_RUN_NUMBER', '0')
 
     with open(version_file, 'r') as f: