Skip to content

Commit

Permalink
fix: update makefile and ostk-core released verison
Browse files Browse the repository at this point in the history
  • Loading branch information
apaletta3 committed Mar 25, 2024
1 parent 2943bd3 commit 158f12f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ IF (NOT Boost_FOUND)
MESSAGE (SEND_ERROR "[Boost] not found.")
ENDIF ()

### Open Space Toolkit ▸ Core [2.2.x]
### Open Space Toolkit ▸ Core [3.0.x]

FIND_PACKAGE ("OpenSpaceToolkitCore" "2.2" REQUIRED)
FIND_PACKAGE ("OpenSpaceToolkitCore" "3.0" REQUIRED)

IF (NOT OpenSpaceToolkitCore_FOUND)

Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ dev_username := developer


# Handle multi-platform builds locally (CI sets these env vars, but need defaults here)
TARGETPLATFORM ?= linux/amd64
TARGETPLATFORM ?= linux/arm64
$(info Target platform is $(TARGETPLATFORM))
PLATFORM_SPECIFIC_PACKAGE_NAME ?= x86_64
$(info Platform specific package name is $(PLATFORM_SPECIFIC_PACKAGE_NAME))


pull: ## Pull all images
Expand Down Expand Up @@ -221,7 +219,7 @@ build-packages-cpp-standalone: ## Build C++ packages (standalone)
@ echo "Building C++ packages..."

docker run \
--platform $(PLATFORM_SPECIFIC_PACKAGE_NAME) \
--platform $(TARGETPLATFORM) \
--rm \
--volume="$(CURDIR):/app:delegated" \
--volume="/app/build" \
Expand All @@ -245,7 +243,7 @@ build-packages-python-standalone: ## Build Python packages (standalone)
@ echo "Building Python packages..."

docker run \
--platform $(PLATFORM_SPECIFIC_PACKAGE_NAME) \
--platform $(TARGETPLATFORM) \
--rm \
--volume="$(CURDIR):/app:delegated" \
--volume="/app/build" \
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Apache License 2.0

open-space-toolkit-core~=2.2.0
open-space-toolkit-core~=3.0.0
4 changes: 2 additions & 2 deletions docker/development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ RUN apt-get update -y \
## Open Space Toolkit ▸ Core

ARG TARGETPLATFORM
ARG OSTK_CORE_MAJOR="2"
ARG OSTK_CORE_MINOR="2"
ARG OSTK_CORE_MAJOR="3"
ARG OSTK_CORE_MINOR="0"

## Force an image rebuild when new Core patch versions are detected
ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-core/git/matching-refs/tags/${OSTK_CORE_MAJOR}.${OSTK_CORE_MINOR} /tmp/open-space-toolkit-core/versions.json
Expand Down

0 comments on commit 158f12f

Please sign in to comment.