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

chore(build): fix push targets in api and s-d #11879

Merged
merged 1 commit into from
Dec 13, 2022
Merged

chore(build): fix push targets in api and s-d #11879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ push: push-no-restart
$(call restart-service,$(host),$(br_ssh_key),$(ssh_opts),"jupyter-notebook opentrons-robot-server")

.PHONY: push-no-restart-ot3
push-no-restart-ot3: $(sdist_file)
push-no-restart-ot3: sdist
echo $(sdist_file)
$(call push-python-sdist,$(host),,$(ssh_opts),$(sdist_file),/opt/opentrons-robot-server,opentrons,src)
ssh $(ssh_opts) root@$(host) "mkdir -p /usr/local/bin"
Expand Down
21 changes: 7 additions & 14 deletions shared-data/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,17 @@ teardown-py:
clean:
$(clean_cmd)


.PHONY: wheel
wheel: $(wheel_file)


.PHONY: sdist
sdist: $(sdist_file)


$(wheel_file): export OPENTRONS_PROJECT=$(project_rs_default)
$(wheel_file): setup.py $(py_sources) $(json_sources)
wheel: export OPENTRONS_PROJECT=$(project_rs_default)
wheel: setup.py $(py_sources) $(json_sources)
$(SHX) mkdir -p build
$(python) setup.py $(wheel_opts) bdist_wheel
$(SHX) ls $(BUILD_DIR)


$(sdist_file): export OPENTRONS_PROJECT=$(project_ot3_default)
$(sdist_file): setup.py $(py_sources) $(json_sources)
.PHONY: sdist
sdist: export OPENTRONS_PROJECT=$(project_ot3_default)
sdist: setup.py $(py_sources) $(json_sources)
$(SHX) mkdir -p build
$(python) setup.py sdist
$(SHX) ls $(BUILD_DIR)
Expand All @@ -109,15 +102,15 @@ format:
$(python) -m black opentrons_shared_data tests setup.py

.PHONY: push-no-restart
push-no-restart: $(wheel_file)
push-no-restart: wheel
$(call push-python-package,$(host),$(br_ssh_key),$(ssh_opts),$(wheel_file))

.PHONY: push
push: push-no-restart
$(call restart-service,$(host),$(br_ssh_key),$(ssh_opts),opentrons-robot-server)

.PHONY: push-no-restart-ot3
push-no-restart-ot3: $(sdist_file)
push-no-restart-ot3: sdist
$(call push-python-sdist,$(host),,$(ssh_opts),$(sdist_file),/opt/opentrons-robot-server,opentrons_shared_data)

.PHONY: push-ot3
Expand Down