From 465914959d7062790013af3ad6a042724d376b3e Mon Sep 17 00:00:00 2001 From: Mark Hamilton Date: Sun, 11 Aug 2024 23:34:16 -0400 Subject: [PATCH 1/3] chore: fix azp caching --- pipeline.yaml | 1 + templates/conda.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pipeline.yaml b/pipeline.yaml index 0e75e509c1..777354df1c 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -56,6 +56,7 @@ variables: CONDA_CACHE_DIR: /usr/share/miniconda/envs ComponentDetection.Timeout: 900 isMaster: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] + AZP_CACHING_CONTENT_FORMAT: Files jobs: - job: Style diff --git a/templates/conda.yml b/templates/conda.yml index 8c36f95929..25c747757e 100644 --- a/templates/conda.yml +++ b/templates/conda.yml @@ -13,6 +13,8 @@ steps: python path: $(CONDA_CACHE_DIR) cacheHitVar: CONDA_CACHE_RESTORED + env: + AZP_CACHING_CONTENT_FORMAT: Files timeoutInMinutes: 20 retryCountOnTaskFailure: 1 - bash: | From a77bda2e16f55ec1e7c5fde6c78cf5dce75246ce Mon Sep 17 00:00:00 2001 From: Mark Hamilton Date: Mon, 12 Aug 2024 14:29:17 -0400 Subject: [PATCH 2/3] wip --- environment.yml | 2 +- pipeline.yaml | 1 - templates/conda.yml | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index e9361ad5de..57f21e84b7 100644 --- a/environment.yml +++ b/environment.yml @@ -51,4 +51,4 @@ dependencies: - markdownify - traitlets - opencv-python - - sentence_transformers~=2.2.2 + - \ No newline at end of file diff --git a/pipeline.yaml b/pipeline.yaml index 777354df1c..0e75e509c1 100644 --- a/pipeline.yaml +++ b/pipeline.yaml @@ -56,7 +56,6 @@ variables: CONDA_CACHE_DIR: /usr/share/miniconda/envs ComponentDetection.Timeout: 900 isMaster: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] - AZP_CACHING_CONTENT_FORMAT: Files jobs: - job: Style diff --git a/templates/conda.yml b/templates/conda.yml index 25c747757e..e2ead3a58c 100644 --- a/templates/conda.yml +++ b/templates/conda.yml @@ -13,12 +13,11 @@ steps: python path: $(CONDA_CACHE_DIR) cacheHitVar: CONDA_CACHE_RESTORED - env: - AZP_CACHING_CONTENT_FORMAT: Files timeoutInMinutes: 20 retryCountOnTaskFailure: 1 - bash: | (timeout 30m conda env create --yes -f environment.yml -v) || (timeout 30m conda env create --yes -f environment.yml -v) + pip install sentence_transformers=2.2.2 displayName: Create Anaconda environment retryCountOnTaskFailure: 1 condition: eq(variables.CONDA_CACHE_RESTORED, 'false') From f68ec47d8667296926128fc1cbc336f5a71b375d Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 6 Sep 2024 23:57:55 -0400 Subject: [PATCH 3/3] Update environment.yml --- environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 57f21e84b7..cc915e64a9 100644 --- a/environment.yml +++ b/environment.yml @@ -50,5 +50,4 @@ dependencies: - pypandoc - markdownify - traitlets - - opencv-python - - \ No newline at end of file + - opencv-python \ No newline at end of file