diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index c671e054..407d8cd8 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -32,7 +32,7 @@ jobs: needs: [ validate-pull ] if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && github.base_ref == 'nightly' && startswith(github.head_ref, 'docker-') steps: - + - name: Create Tag id: create-tag run: | diff --git a/VERSION b/VERSION index 8ef5e256..e9105543 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1-develop29 +2.0.1-develop30 diff --git a/modules/request.py b/modules/request.py index 3559552d..eefb8dbd 100644 --- a/modules/request.py +++ b/modules/request.py @@ -161,7 +161,7 @@ class Requests: def guess_branch(self): if self.git_branch: return self.git_branch - elif self.env_version in ["nightly", "develop"]: + elif self.env_version: return self.env_version elif self.file_version[2] > 0: dev_version = self.get_develop() @@ -173,10 +173,10 @@ class Requests: return "master" def current_version(self, version, branch=None): - if branch == "nightly": - return self.get_nightly() - elif branch == "develop": + if branch == "develop": return self.get_develop() + elif branch: + return self.get_nightly() elif version[2] > 0: new_version = self.get_develop() if version[1] != new_version[1] or new_version[2] >= version[2]: