From c2642974d984583c41df9fe9f5c04541cd208e5c Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 19 Jan 2022 10:12:28 +0100 Subject: [PATCH 1/6] do not validate version if build does not support it --- openpype/lib/__init__.py | 2 ++ openpype/tools/tray/pype_tray.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py index 62d204186d..1c8f7a57af 100644 --- a/openpype/lib/__init__.py +++ b/openpype/lib/__init__.py @@ -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", diff --git a/openpype/tools/tray/pype_tray.py b/openpype/tools/tray/pype_tray.py index 0d3e7ae04c..c9b8aaa842 100644 --- a/openpype/tools/tray/pype_tray.py +++ b/openpype/tools/tray/pype_tray.py @@ -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 From f6441176e16dcba607ad0c3af2162a8ccfe45b8f Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 19 Jan 2022 17:11:57 +0100 Subject: [PATCH 2/6] set env variables to skip validation of 3rd party libs --- .github/workflows/test_build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 6e1e38d0b2..dd52e83b61 100644 --- 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: | + echo "1" >> $SKIP_THIRD_PARTY_VALIDATION ./tools/build.sh # MacOS-latest: From c4de9bc9ace6ed22e75913be55faecc7f34045e0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 19 Jan 2022 17:26:48 +0100 Subject: [PATCH 3/6] try use 'env' in step configuration --- .github/workflows/test_build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index dd52e83b61..6dea05559b 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -36,8 +36,9 @@ jobs: - name: πŸ”¨ Build shell: pwsh + env: + SKIP_THIRD_PARTY_VALIDATION: "1" run: | - $env:SKIP_THIRD_PARTY_VALIDATION = "1" ./tools/build.ps1 Ubuntu-latest: @@ -61,6 +62,8 @@ jobs: ./tools/create_env.sh - name: πŸ”¨ Build + env: + SKIP_THIRD_PARTY_VALIDATION: "1" run: | echo "1" >> $SKIP_THIRD_PARTY_VALIDATION ./tools/build.sh From 750944ca21fd04711eced4b6e28b54ffd6f717b0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 19 Jan 2022 17:44:22 +0100 Subject: [PATCH 4/6] try to get rid of spaces --- .github/workflows/test_build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 6dea05559b..9e098db69b 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -37,7 +37,7 @@ jobs: - name: πŸ”¨ Build shell: pwsh env: - SKIP_THIRD_PARTY_VALIDATION: "1" + SKIP_THIRD_PARTY_VALIDATION: 1 run: | ./tools/build.ps1 @@ -63,9 +63,8 @@ jobs: - name: πŸ”¨ Build env: - SKIP_THIRD_PARTY_VALIDATION: "1" + SKIP_THIRD_PARTY_VALIDATION: 1 run: | - echo "1" >> $SKIP_THIRD_PARTY_VALIDATION ./tools/build.sh # MacOS-latest: From e63b14d781419f5f944f7c9c806401ec4c4e9563 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 19 Jan 2022 18:09:17 +0100 Subject: [PATCH 5/6] use export command --- .github/workflows/test_build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 9e098db69b..3b5e6dc970 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -36,9 +36,8 @@ jobs: - name: πŸ”¨ Build shell: pwsh - env: - SKIP_THIRD_PARTY_VALIDATION: 1 run: | + $env:SKIP_THIRD_PARTY_VALIDATION="1" ./tools/build.ps1 Ubuntu-latest: @@ -62,9 +61,8 @@ jobs: ./tools/create_env.sh - name: πŸ”¨ Build - env: - SKIP_THIRD_PARTY_VALIDATION: 1 run: | + export SKIP_THIRD_PARTY_VALIDATION=1 ./tools/build.sh # MacOS-latest: From 7affac0d1adfe96a9c06b918e7e3c39bf43fd6f3 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Wed, 19 Jan 2022 19:43:46 +0100 Subject: [PATCH 6/6] fix setting of env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: OndΕ™ej Samohel <33513211+antirotor@users.noreply.github.com> --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 3b5e6dc970..ac7279117a 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -62,7 +62,7 @@ jobs: - name: πŸ”¨ Build run: | - export SKIP_THIRD_PARTY_VALIDATION=1 + export SKIP_THIRD_PARTY_VALIDATION="1" ./tools/build.sh # MacOS-latest: