Skip to content

Commit

Permalink
Update workflows and docker for vcpkg
Browse files Browse the repository at this point in the history
  • Loading branch information
jameseh96 committed Oct 15, 2024
1 parent dcf6e3f commit 99be440
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 51 deletions.
28 changes: 4 additions & 24 deletions .github/workflows/pypi-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,12 @@ jobs:
- uses: actions/checkout@master
with:
submodules: recursive
- name: Set up Python 3 for Conan
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Setup vcpkg
uses: lukka/run-vcpkg@v11
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.17.x'
- name: Install Python packages
run: pip3 install conan==1.* setuptools wheel
- name: Check Conan
run: which conan
- name: Check Conan version
run: conan --version
- name: Create default conan profile
run: conan profile new default --detect
- name: Add conancenter remote
run: conan remote add -f conancenter https://center.conan.io
- name: build wheels
uses: pypa/[email protected]
- uses: actions/upload-artifact@v4
Expand All @@ -89,20 +77,12 @@ jobs:
- uses: actions/checkout@master
with:
submodules: recursive
- name: Set up Python 3 for Conan
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Setup vcpkg
uses: lukka/run-vcpkg@v11
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.17.x'
- name: Install Python packages
run: pip3 install conan==1.* setuptools wheel
- name: Create default conan profile
run: conan profile new default --detect
- name: Add conancenter remote
run: conan remote add -f conancenter https://center.conan.io
- name: build wheels
uses: pypa/[email protected]
- uses: actions/upload-artifact@v4
Expand Down
16 changes: 6 additions & 10 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
ARG ARCH=x86_64
FROM quay.io/pypa/manylinux2014_${ARCH}:latest

# Image derived from standard manylinux Python wheel building env, with conan added.
# Wraps conan in a bash script setting the appropriate PYTHONPATH.
# If building the wheel for Python2, conan will fail to run as it will use the wrong
# libs.

RUN yum install -y python3 glibc-headers python3-devel
RUN /usr/bin/python3 -m ensurepip --upgrade
RUN /usr/bin/python3 -m pip install --upgrade conan==1.* wheel
RUN conan profile new default --detect
RUN conan remote add -f conancenter https://center.conan.io
RUN yum install -y curl zip unzip tar
RUN git clone https://github.com/microsoft/vcpkg.git
RUN cd vcpkg && git checkout 2024.09.30
RUN ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
ENV VCPKG_ROOT=/vcpkg
ENV PATH="$PATH:$VCPKG_ROOT"
7 changes: 0 additions & 7 deletions docker/conan_workaround

This file was deleted.

16 changes: 6 additions & 10 deletions docker/musl_Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
ARG ARCH=x86_64
FROM quay.io/pypa/musllinux_1_1_${ARCH}:latest

# Image derived from standard manylinux Python wheel building env, with conan added.
# Wraps conan in a bash script setting the appropriate PYTHONPATH.
# If building the wheel for Python2, conan will fail to run as it will use the wrong
# libs.

RUN apk update && apk add python3 python3-dev
RUN /usr/bin/python3 -m ensurepip --upgrade
RUN /usr/bin/python3 -m pip install --upgrade conan==1.* wheel
RUN conan profile new default --detect
RUN conan remote add -f conancenter https://center.conan.io
RUN apk update && apk add build-base cmake ninja zip unzip curl git
RUN git clone https://github.com/microsoft/vcpkg.git
RUN cd vcpkg && git checkout 2024.09.30
RUN ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
ENV VCPKG_ROOT=/vcpkg
ENV PATH="$PATH:$VCPKG_ROOT"

0 comments on commit 99be440

Please sign in to comment.