Skip to content

Commit

Permalink
Try using pybind 2.13.1, revert dockerfile changes and don't run-vcpk…
Browse files Browse the repository at this point in the history
…g for ubuntu
  • Loading branch information
pseudo-rnd-thoughts committed Jul 16, 2024
1 parent 61de151 commit 384ec19
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .github/docker/manylinux-vcpkg.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ LABEL org.opencontainers.image.source https://github.com/Farama-Foundation/Arcad

RUN yum install -y curl unzip zip tar

#RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg
#RUN cd /opt/vcpkg && git reset --hard 8150939b6
#
#
#ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
#ENV PATH="${PATH}:/opt/vcpkg"
#
#RUN mkdir -p /root/.vcpkg && touch /root/.vcpkg/vcpkg.path.txt
#
#RUN bootstrap-vcpkg.sh && \
# vcpkg integrate install && \
# vcpkg integrate bash
RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg
RUN cd /opt/vcpkg && git reset --hard 8150939b6


ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
ENV PATH="${PATH}:/opt/vcpkg"

RUN mkdir -p /root/.vcpkg && touch /root/.vcpkg/vcpkg.path.txt

RUN bootstrap-vcpkg.sh && \
vcpkg integrate install && \
vcpkg integrate bash
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ jobs:
uses: docker/setup-buildx-action@v1
with:
install: true

- name: Build Docker image with vcpkg
if: runner.os == 'linux'
# using build-push-action (without push) to make use of cache arguments
Expand All @@ -177,6 +176,7 @@ jobs:
run: brew install pkg-config

- uses: lukka/run-vcpkg@v11
if: runner.os != 'linux'
with:
vcpkgGitCommitId: "8150939b69720adc475461978e07c2d2bf5fb76e"
# There's a permissions issue with the cache
Expand All @@ -202,6 +202,7 @@ jobs:
needs: [build-wheels, build-scratch]

strategy:
fail-fast: false
matrix:
include:
# example wheel names (if the wheel names change, look at the `ls wheels/` for the new names)
Expand Down
2 changes: 1 addition & 1 deletion src/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include(FetchContent)
FetchContent_Declare(
pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11
GIT_TAG v2.12.0)
GIT_TAG v2.13.1)
FetchContent_MakeAvailable(pybind11)

add_library(ale-py MODULE ale_python_interface.cpp)
Expand Down

0 comments on commit 384ec19

Please sign in to comment.