Merge pull request #5719 from akva2/fix_pypi_release

fixed: building pypi release packages
This commit is contained in:
Bård Skaflestad 2024-11-07 12:05:42 +01:00 committed by GitHub
commit ed290b4b36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions

View File

@ -3,16 +3,19 @@
# sudo docker build -t manylinux2014_opm:built . -f python/Dockerfile # sudo docker build -t manylinux2014_opm:built . -f python/Dockerfile
FROM quay.io/pypa/manylinux_2_28_x86_64 AS stage1 FROM quay.io/pypa/manylinux_2_28_x86_64 AS stage1
ARG version_tag="" ARG version="master"
ARG build_jobs=4 ARG build_jobs=4
ARG version_tag=""
WORKDIR /tmp/opm WORKDIR /tmp/opm
RUN echo "Using version: $version"
RUN echo "Using package version tag: $version_tag" RUN echo "Using package version tag: $version_tag"
RUN echo "Number of build jobs: $build_jobs"
ADD . . ADD . .
RUN /bin/bash setup-docker-image.sh RUN /bin/bash setup-docker-image.sh
FROM stage1 AS stage2 FROM stage1 AS stage2
RUN /bin/bash build-deps.sh $build_jobs RUN /bin/bash build-deps.sh $build_jobs
FROM stage2 AS stage3 FROM stage2 AS stage3
RUN /bin/bash generate-pypi-package.sh $version_tag $build_jobs RUN /bin/bash generate-pypi-package.sh "$version" "$build_jobs" "$version_tag"
FROM scratch AS export_stage FROM scratch AS export_stage
COPY --from=stage3 /tmp/opm/wheelhouse . COPY --from=stage3 /tmp/opm/wheelhouse .

View File

@ -2,8 +2,9 @@
set -e set -e
VERSION_TAG=${1:-""} VERSION=${1:-"master"}
BUILD_JOBS=$2 BUILD_JOBS=${2:-16}
VERSION_TAG=${3:-""}
export CMAKE_GENERATOR=Ninja export CMAKE_GENERATOR=Ninja
@ -25,9 +26,9 @@ done
DIR=`pwd` DIR=`pwd`
# Setup opm modules # Setup opm modules
git clone https://github.com/OPM/opm-common git clone https://github.com/OPM/opm-common -b $VERSION
git clone https://github.com/OPM/opm-grid git clone https://github.com/OPM/opm-grid -b $VERSION
git clone https://github.com/OPM/opm-simulators git clone https://github.com/OPM/opm-simulators -b $VERSION
git clone https://github.com/OPM/opm-utilities git clone https://github.com/OPM/opm-utilities
ln -sf opm-utilities/opm-super/CMakeLists.txt CMakeLists.txt ln -sf opm-utilities/opm-super/CMakeLists.txt CMakeLists.txt