diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a8b69ac..0e0c621 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -5,18 +5,23 @@ on: [push, pull_request] # versions and macOS / Windows. jobs: - build_wheels_linux: - name: Build Linux wheels - # The Docker container the job is run in. - container: quay.io/pypa/manylinux2014_x86_64 + build_wheels: + strategy: + matrix: + os: [macos-11] #### TEMP # [ubuntu-latest, macos-11] + name: Build wheels # The host system that runs Docker. - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + # The Docker container the job is run in. + container: ${{ matrix.os == 'ubuntu-latest' && 'quay.io/pypa/manylinux2014_x86_64' || null }} steps: - uses: actions/checkout@v3 - uses: conda-incubator/setup-miniconda@v2 with: miniconda-version: latest - environment-file: ci/environment/conda-linux-64.lock + environment-file: ${{ matrix.os == 'ubuntu-latest' && 'ci/environment/conda-linux-64.lock' || 'ci/environment/conda-osx-64.lock' }} + - name: Set up SSH + uses: mxschmitt/action-tmate@v3 - name: Build the wheels # The following line here and elsewhere is needed for our Conda environment to # be activated. See: diff --git a/ci/build.sh b/ci/build.sh index 32b4e32..07f2ee1 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -24,7 +24,7 @@ curl -O https://poppler.freedesktop.org/$POPPLER.tar.xz tar -xf $POPPLER.tar.xz # Patch Poppler to avoid building the tests. Newer Poppler versions have a config # variable for this. -sed -i 's/add_subdirectory(test)//g' $POPPLER/CMakeLists.txt +sed -iback 's/add_subdirectory(test)//g' $POPPLER/CMakeLists.txt pushd $POPPLER