diff --git a/.github/docker/manylinux-vcpkg.Dockerfile b/.github/docker/manylinux-vcpkg.Dockerfile index e93b7b1be..6f5ca2a53 100644 --- a/.github/docker/manylinux-vcpkg.Dockerfile +++ b/.github/docker/manylinux-vcpkg.Dockerfile @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b98fe6d15..a46fbad0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 8dd72fd1d..7a38cd583 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -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)