diff --git a/.github/workflows/build-wheel-linux.yml b/.github/workflows/build-wheel-linux.yml index 6120dbdd..c146e1f7 100644 --- a/.github/workflows/build-wheel-linux.yml +++ b/.github/workflows/build-wheel-linux.yml @@ -24,7 +24,7 @@ jobs: runs-on: [self-hosted, Linux, platform-builder-Rocky-8.6] # TODO which manylinux do we want to build for? 2014? 2_28? 2_34? Matrix? container: - image: eccr.ecmwf.int/wheelmaker/2_28:0.9 + image: eccr.ecmwf.int/wheelmaker/2_28:0.10 credentials: username: ${{ secrets.ECMWF_DOCKER_REGISTRY_USERNAME }} password: ${{ secrets.ECMWF_DOCKER_REGISTRY_ACCESS_TOKEN }} @@ -36,9 +36,9 @@ jobs: - run: git clone --depth=1 --branch="${GITHUB_REF#refs/heads/}" https://github.com/$GITHUB_REPOSITORY /proj - run: cd /proj && /buildscripts/prepare_deps.sh ./python_wrapper/buildconfig 3.11 - run: cd /proj && /buildscripts/compile.sh ./python_wrapper/buildconfig - - run: cd /proj && /buildscripts/wheel-linux.sh ./python_wrapper/buildconfig 3.11 - - run: cd /proj && /buildscripts/test-wheel.sh ./python_wrapper/buildconfig 3.11 /build/wheel/*whl - - run: cd /proj && /buildscripts/upload-pypi.sh /build/wheel/*whl + - run: cd /proj && PYTHONPATH=/buildscripts /buildscripts/wheel-linux.sh ./python_wrapper/buildconfig 3.11 + - run: cd /proj && /buildscripts/test-wheel.sh ./python_wrapper/buildconfig 3.11 /tmp/build/wheel/*whl + - run: cd /proj && /buildscripts/upload-pypi.sh /tmp/build/wheel/*whl env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} diff --git a/python_wrapper/buildconfig b/python_wrapper/buildconfig index 6dc5775f..e07247fd 100644 --- a/python_wrapper/buildconfig +++ b/python_wrapper/buildconfig @@ -13,5 +13,5 @@ NAME="odc" CMAKE_PARAMS="" PYPROJECT_DIR="python_wrapper" -export eckit_ROOT="/prereqs/eckit" +export eckit_ROOT="/tmp/prereqs/eckit" DEPENDENCIES='["eckit"]'