ci: no det version parameter via continued config

determined-ai · Oct 29, 2024 · a94ed82 · a94ed82
1 parent 983a8ab
commit a94ed82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -87,16 +87,6 @@ jobs:
               mv -v tmpfile "<<pipeline.parameters.params_basename>>"
             fi
 
-      - run:
-          name: Set det-version parameter.
-          command: |
-            VERSION=$(./version.sh)
-            echo "Version is: [${VERSION}]"
-            echo "CIRCLE_TAG is: [${CIRCLE_TAG}]"
-            jq --arg version "${VERSION}" '. += {"det-version": $version}' < "<<pipeline.parameters.params_basename>>" > tmpfile
-            mv -v tmpfile "<<pipeline.parameters.params_basename>>"
-            cat "<<pipeline.parameters.params_basename>>"
-
       # this must be last; persist the file to the workspace
       - persist_to_workspace:
           root: .

diff --git a/.circleci/real_config.yml b/.circleci/real_config.yml
@@ -19,9 +19,6 @@ executors:
       - image: python:3.9-slim-bookworm
 
 parameters:
-  det-version:
-    type: string
-    default: ""
   docker-image:
     type: string
     default: determinedai/cimg-base:latest
@@ -391,18 +388,17 @@ commands:
 
   install-wheel:
     parameters:
-      package-name:
-        type: string
       package-location:
         type: string
     steps:
       - run:
-          name: Install <<parameters.package-name>>
+          name: Install determined
           working_directory: <<parameters.package-location>>
           command: |
+            VERSION=$(./version.sh)
             make build
-            pip install --find-links dist <<parameters.package-name>>==<< pipeline.parameters.det-version >>
-            pip install --no-deps --force-reinstall --find-links dist <<parameters.package-name>>==<< pipeline.parameters.det-version >>
+            pip install --find-links dist determined==${VERSION}
+            pip install --no-deps --force-reinstall --find-links dist determined==${VERSION}
 
   setup-python-venv:
     description: Set up and create Python venv.
@@ -507,7 +503,6 @@ commands:
                 name: Install pypa builder
                 command: python3 -m pip install build
             - install-wheel:
-                package-name: determined
                 package-location: ./harness
       - run:
           name: Install <<parameters.extras-requires>>
@@ -2700,16 +2695,18 @@ jobs:
       executor-name:
         type: string
     executor: << parameters.executor-name >>
-    environment:
-      VERSION: "<< pipeline.parameters.det-version >>"
     steps:
       - checkout
+      - run:
+          name: Set VERSION environment variable
+          command: |
+            echo "export VERSION=$(./version.sh)" >> $BASH_ENV
       - python-report
       # Running the pip executable causes an error with the win/default executor for some reason.
       - run: python -m pip install --upgrade --user pip
       - run: pip install wheel setuptools build
       - run: cd harness; python -m build --wheel --outdir ../build
-      - run: pip install --find-links build determined==<< pipeline.parameters.det-version >>
+      - run: pip install --find-links build determined==${VERSION}
       - run: pip freeze --all
       # Allow this to fail, but it is useful for debugging.
       - run: sh -c "pip check || true"