Skip to content
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.

Sign up for GitHub

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

Jump to bottom

✨ Added port to project.pros: #292

Merged
merged 13 commits into from
Sep 29, 2023
Merged

✨ Added port to project.pros: #292

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a8dd15f
Uninstall charset_normalizer
ayushuk Mar 2, 2023
b08bb8d
Merge pull request #274 from purduesigbots/bugfix/fix-ci-macos-univer…
ayushuk Mar 3, 2023
7efe6ff
added port option
Aniket-Rai1 Jun 3, 2023
5510335
Update pros/cli/conductor.py
Aniket-Rai1 Jun 3, 2023
4957ed7
Update .github/workflows/main.yml
Aniket-Rai1 Jun 3, 2023
7180d6e
Update pros/cli/upload.py
Aniket-Rai1 Jun 3, 2023
da40202
🐛 Fix fat binary error in CI (#293)
BennyBot Jun 3, 2023
e029886
Uninstall charset_normalizer
ayushuk Mar 2, 2023
5bab438
added port option
Aniket-Rai1 Jun 3, 2023
c566904
Update pros/cli/conductor.py
Aniket-Rai1 Jun 3, 2023
3931c14
Update .github/workflows/main.yml
Aniket-Rai1 Jun 3, 2023
3a4847b
Update pros/cli/upload.py
Aniket-Rai1 Jun 3, 2023
82a0870
Merge remote-tracking branch 'origin/feature/port' into feature/port
BennyBot Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pros/cli/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ def upload(path: Optional[str], project: Optional[c.Project], port: str, **kwarg

# apply upload_options as a template
options = dict(**project.upload_options)
if 'port' in options and port is None:
port = options.get('port', None)
if 'slot' in options and kwargs.get('slot', None) is None:
kwargs.pop('slot')
elif kwargs.get('slot', None) is None:
Expand Down