fixing nightly versioning

.github/workflows/milestone_assign.yml

@@ -25,4 +25,4 @@ jobs:
         uses: zoispag/action-assign-milestone@v1
         with:
           repo-token: "${{ secrets.YNPUT_BOT_TOKEN }}"
-          milestone: 'next-patch'
+          milestone: 'next-patch'

.github/workflows/milestone_create.yml

@@ -59,4 +59,4 @@ jobs:
         with:
           title: 'next-minor'
         env:
-          GITHUB_TOKEN: "${{ secrets.YNPUT_BOT_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.YNPUT_BOT_TOKEN }}"

.github/workflows/nightly_merge.yml

@@ -26,4 +26,4 @@ jobs:
       uses: benc-uk/workflow-dispatch@v1
       with:
         workflow: Nightly Prerelease
-        token: ${{ secrets.ADMIN_TOKEN }}
+        token: ${{ secrets.ADMIN_TOKEN }}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.15.1-nightly.3" # OpenPype
+version = "3.15.0" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

tools/ci_tools.py

@@ -7,16 +7,10 @@ from github import Github
 import os
 
 def get_release_type_github(Log, github_token):
-    # print(Log)
     minor_labels = ["Bump Minor"]
-    # patch_labels = [
-    #     "type: enhancement",
-    #     "type: bug",
-    #     "type: deprecated",
-    #     "type: Feature"]
 
     g = Github(github_token)
-    repo = g.get_repo("pypeclub/OpenPype")
+    repo = g.get_repo("ynput/OpenPype")
 
     labels = set()
     for line in Log.splitlines():
@@ -35,12 +29,12 @@ def get_release_type_github(Log, github_token):
     else:
         return "patch"
 
-    # TODO: if all is working fine, this part can be cleaned up eventually 
+    # TODO: if all is working fine, this part can be cleaned up eventually
     # if any(label in labels for label in patch_labels):
     #     return "patch"
-            
+
     return None
-    
+
 
 def remove_prefix(text, prefix):
     return text[text.startswith(prefix) and len(prefix):]
@@ -93,12 +87,16 @@ def file_regex_replace(filename, regex, version):
         f.truncate()
 
 
-def bump_file_versions(version):
+def bump_file_versions(version, nightly=False):
 
     filename = "./openpype/version.py"
     regex = "(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-((0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?"
     file_regex_replace(filename, regex, version)
 
+    if nightly:
+        # skip nightly reversion in pyproject.toml
+        return
+
     # bump pyproject.toml
     filename = "pyproject.toml"
     regex = "version = \"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(\+((0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?\" # OpenPype"
@@ -196,7 +194,7 @@ def main():
     if options.nightly:
         next_tag_v = calculate_next_nightly(github_token=options.github_token)
         print(next_tag_v)
-        bump_file_versions(next_tag_v)
+        bump_file_versions(next_tag_v, True)
 
     if options.finalize:
         new_release = finalize_prerelease(options.finalize)
@@ -222,7 +220,7 @@ def main():
         new_prerelease = current_prerelease.bump_prerelease().__str__()
         print(new_prerelease)
         bump_file_versions(new_prerelease)
-    
+
     if options.version:
         bump_file_versions(options.version)
         print(f"Injected version {options.version} into the release")