Merge pull request ynput#2557 from pypeclub/bugfix/skip_version_check…

…_on_older_builds General: Do not validate version if build does not support it
icyvapor · Jan 19, 2022 · 0d319af · 0d319af
2 parents 7afc0e8 + 7affac0
commit 0d319af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
@@ -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:

diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
@@ -169,6 +169,7 @@
 )
 
 from .openpype_version import (
+ op_version_control_available,
  get_openpype_version,
  get_build_version,
  get_expected_version,
@@ -306,6 +307,7 @@
  "create_workdir_extra_folders",
  "get_project_basic_paths",
 
+ "op_version_control_available",
  "get_openpype_version",
  "get_build_version",
  "get_expected_version",

diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py
@@ -16,6 +16,7 @@
 )
 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 @@ def execute_doubleclick(self):
 
  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