-
Notifications
You must be signed in to change notification settings - Fork 368
ci: no det version parameter via continued config #10151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
a94ed82
d2851e2
8125381
1c291e6
65d14ab
70a34cd
333ff1e
8543868
af98fab
583648e
63ffe35
bb31565
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,15 +13,12 @@ orbs: | |
| executors: | ||
| python-38: | ||
| docker: | ||
| - image: python:3.8-slim-bookworm | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. these didnt have git installed, so they couldn't run the script
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch! |
||
| - image: cimg/python:3.8 | ||
| python-39: | ||
| docker: | ||
| - image: python:3.9-slim-bookworm | ||
| - image: cimg/python:3.9 | ||
|
|
||
| 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>> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this previously required
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It looks like this could install any package the same way instead of only installing Determined. 🤷♂️ If it's only used for one package, then I agree that the parameter is unecessary. (FWIW, the blame probably shows that I wrote all this stuff because I renamed the config file when switching to dynamic config. :))
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ohh okay! thanks for looking |
||
| name: Install determined | ||
| working_directory: <<parameters.package-location>> | ||
| command: | | ||
| VERSION=$(~/project/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,40 @@ jobs: | |
| executor-name: | ||
| type: string | ||
| executor: << parameters.executor-name >> | ||
| environment: | ||
| VERSION: "<< pipeline.parameters.det-version >>" | ||
| steps: | ||
| - checkout | ||
| - when: | ||
| condition: | ||
| equal: [ win/default, << parameters.executor-name >> ] | ||
| steps: | ||
| - run: | ||
| name: Set VERSION environment variable | ||
| command: | | ||
| $version = & bash ./version.sh | ||
| setx VERSION $version | ||
| - unless: | ||
| condition: | ||
| equal: [ win/default, << parameters.executor-name >> ] | ||
| steps: | ||
| - run: | ||
| name: Set VERSION environment variable | ||
| command: | | ||
| echo "export VERSION=$(cd ~/project && ./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 >> | ||
| - when: | ||
| condition: | ||
| equal: [ win/default, << parameters.executor-name >> ] | ||
| steps: | ||
| - run: pip install --find-links build determined==$env:VERSION | ||
| - unless: | ||
| condition: | ||
| equal: [ win/default, << parameters.executor-name >> ] | ||
| steps: | ||
| - 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" | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.