Merge branch 'master' into vscode-config

flyteorg · Dec 19, 2023 · 86cafd9 · 86cafd9
2 parents 4021387 + 6c6656c
commit 86cafd9
Show file tree

Hide file tree

Showing 33 changed files with 2,294 additions and 925 deletions.
diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml
@@ -8,15 +8,16 @@ build:
   os: "ubuntu-22.04"
   tools:
     python: "mambaforge-22.9"
-  commands:
-    - cat monodocs-environment.lock.yaml
-    - mamba install -c conda-forge conda-lock
-    - conda-lock install -p /home/docs/monodocs-env monodocs-environment.lock.yaml
-    - conda info
-    - conda env list
-    - cat docs/conf.py
-    - cd docs && /home/docs/monodocs-env/bin/python -m sphinx -T -E -b html -d docs/_build/doctrees -D language=en . $READTHEDOCS_OUTPUT/html
+  jobs:
+    post_install:
+      - conda-lock install --name $READTHEDOCS_VERSION monodocs-environment.lock.yaml
+      - conda info
+      - conda env list
+      - conda list
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
+
+conda:
+  environment: docs/build-environment.yaml
diff --git a/docs/build-environment.yaml b/docs/build-environment.yaml
@@ -0,0 +1,6 @@
+name: latest
+channels:
+  - conda-forge
+dependencies:
+  - python=3.10
+  - conda-lock
diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc
diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h b/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h