Merge pull request #2557 from pypeclub/bugfix/skip_version_check_on_older_builds

General: Do not validate version if build does not support it
This commit is contained in:
Jakub Trllo 2022-01-19 19:44:02 +01:00 committed by GitHub
commit 0d319aff4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions

View file

@ -37,6 +37,7 @@ jobs:
- name: 🔨 Build
shell: pwsh
run: |
$env:SKIP_THIRD_PARTY_VALIDATION="1"
./tools/build.ps1
Ubuntu-latest:
@ -61,6 +62,7 @@ jobs:
- name: 🔨 Build
run: |
export SKIP_THIRD_PARTY_VALIDATION="1"
./tools/build.sh
# MacOS-latest:

View file

@ -169,6 +169,7 @@ from .editorial import (
)
from .openpype_version import (
op_version_control_available,
get_openpype_version,
get_build_version,
get_expected_version,
@ -306,6 +307,7 @@ __all__ = [
"create_workdir_extra_folders",
"get_project_basic_paths",
"op_version_control_available",
"get_openpype_version",
"get_build_version",
"get_expected_version",

View file

@ -16,6 +16,7 @@ from openpype.api import (
)
from openpype.lib import (
get_openpype_execute_args,
op_version_control_available,
is_current_version_studio_latest,
is_running_from_build,
is_running_staging,
@ -218,7 +219,7 @@ class TrayManager:
def _on_version_check_timer(self):
# Check if is running from build and stop future validations if yes
if not is_running_from_build():
if not is_running_from_build() or not op_version_control_available():
self._version_check_timer.stop()
return