Merge branch 'develop'

NREL · Mar 4, 2024 · dc7cbbe · dc7cbbe
2 parents 4138880 + 6d2fcc9
commit dc7cbbe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 #pattern  filter=crypt diff=crypt
-julia_src/xpress/licenseserver/xpauth.xpr filter=crypt diff=crypt merge=crypt
+julia_src/licenseserver/xpauth.xpr filter=crypt diff=crypt merge=crypt
diff --git a/werf-giterminism.yaml b/werf-giterminism.yaml
@@ -9,4 +9,4 @@ config:
       - julia_src/Dockerfile.xpress
     allowContextAddFiles:
       - julia_src/Dockerfile.xpress
-      - julia_src/xpress/licenseserver
+      - julia_src/licenseserver
diff --git a/werf.yaml b/werf.yaml
@@ -13,7 +13,7 @@ context: julia_src/
 dockerfile: Dockerfile.xpress
 contextAddFiles:
   - Dockerfile.xpress
-  - xpress/licenseserver
+  - licenseserver
 args:
   XPRESS_LICENSE_HOST: {{ env "XPRESS_LICENSE_HOST" | quote }}
   NREL_ROOT_CERT_URL_ROOT: {{ env "NREL_ROOT_CERT_URL_ROOT" | quote }}