Commit b5259fa6 authored by Paal Kvamme's avatar Paal Kvamme
Browse files

General maintenance on build rules.

parent 3f9f56ea
......@@ -25,8 +25,8 @@ steps:
deploy.tgz
deploy/pure/OpenZGY-*-py3-none-any.whl
deploy/pure/OpenZGY-*.tar.gz
deploy/native/centos8-gcc83/libopenzgy.so.*.*
deploy/native/centos8-gcc84/libopenzgy.so.*.*
deploy/native/include/openzgy/api.h
deploy/native/include/openzgy/exception.h
deploy/native/include/openzgy/iocontext.h
deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
......@@ -25,10 +25,10 @@ steps:
deploy.tgz
deploy/pure/OpenZGY-*-py3-none-any.whl
deploy/pure/OpenZGY-*.tar.gz
deploy/native/centos8-gcc83/libopenzgy.so.*.*
deploy/native/centos8-gcc83/libsdapi.so.*.*.*
deploy/native/centos8-gcc84/libopenzgy.so.*.*
deploy/native/centos8-gcc84/libsdapi.so.*.*.*
deploy/native/include/openzgy/api.h
deploy/native/include/openzgy/exception.h
deploy/native/include/openzgy/iocontext.h
deploy/sdglue/centos8-gcc83/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deploy/sdglue/centos8-gcc84/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
......@@ -26,10 +26,10 @@ steps:
deploy.tgz
deploy/pure/OpenZGY-*-py3-none-any.whl
deploy/pure/OpenZGY-*.tar.gz
deploy/native/centos8-gcc83/libopenzgy.so.*.*
deploy/native/centos8-gcc83/libsdapi.so.*.*.*
deploy/native/centos8-gcc84/libopenzgy.so.*.*
deploy/native/centos8-gcc84/libsdapi.so.*.*.*
deploy/native/include/openzgy/api.h
deploy/native/include/openzgy/exception.h
deploy/native/include/openzgy/iocontext.h
deploy/sdglue/centos8-gcc83/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc83/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
deploy/sdglue/centos8-gcc84/SdGlue-*-cp36-cp36m-linux_x86_64.whl
deploy/wrapper/centos8-gcc84/OpenZgyBindings-*-cp36-cp36m-linux_x86_64.whl
......@@ -69,8 +69,7 @@ ifneq ($(strip $(HAVE_SD)),)
$(SD_SENTINEL) $(SD_LIBRARY): $(SD_ZIPFILE)
$(RM) -rf $(SD_BUILDDIR)
/bin/mkdir -p $(SD_BUILDDIR)
tar zxf $(SD_ZIPFILE) -C $(SD_BUILDDIR) --wildcards '*/libsdapi.so*'
tar zxf $(SD_ZIPFILE) -C $(SD_BUILDDIR) --wildcards '*/include'
tar zxf $(SD_ZIPFILE) -C $(SD_BUILDDIR) --wildcards '*/libsdapi.so*' 'include' 'version.txt'
touch $(SD_SENTINEL)
else
$(SD_SENTINEL):
......
......@@ -14,6 +14,9 @@
FROM ubuntu:bionic
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN apt-get update; \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
make cmake gcc gdb strace valgrind \
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM ubuntu:bionic
ARG TOUCH=1
RUN apt-get update; apt-get -y install libssl1.1 libcurl4 python3 python3-pip
WORKDIR /home/build/oz
ADD deploy.tgz build/
......
......@@ -14,6 +14,9 @@
FROM debian:buster
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN apt-get update; \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
make cmake gcc gdb strace valgrind \
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM debian:buster
ARG TOUCH=1
RUN apt-get update; apt-get -y install libssl1.1 libcurl4 python3 python3-pip
WORKDIR /home/build/oz
ADD deploy.tgz build/
......
......@@ -14,10 +14,13 @@
FROM centos:centos8
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN dnf -y install epel-release dnf-plugins-core; \
dnf config-manager --set-enabled powertools; \
dnf -y install \
make cmake3 gcc-c++ libgomp gdb strace \
make cmake gcc-c++ libgomp gdb strace \
uuid uuid-devel openssl openssl-devel valgrind-devel libxslt \
curl curl-devel bzip2 less zip unzip which sudo doxygen java \
python2 python3 python3-devel python3-tkinter
......@@ -35,6 +38,9 @@ RUN python3 -m ensurepip; \
# texlive-epstopdf texlive-tabu texlive-multirow \
# texlive-adjustbox texlive-sectsty texlive-tocloft
# --- TEMPORARY KLUDGES -- #
RUN dnf -y install libarchive # CMake bug, deps to newer version are missing.
# Workaround for a bug in the Azure SDK or one of ite dependencies,
# sometimes looking for the certificate file in the wrong place.
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM centos:centos8
ARG TOUCH=1
RUN dnf -y install python3 libgomp; python3 -m pip install --upgrade pip
# Workaround for a bug in the Azure SDK or one of its dependencies.
RUN test -r /etc/ssl/cert.pem || ln -s /etc/pki/tls/cert.pem /etc/ssl/cert.pem
......
......@@ -14,6 +14,9 @@
FROM ubuntu:focal
# Change this if the cache needs to be invalidated on all build servers.
ARG TOUCH=1
RUN apt-get update; \
DEBIAN_FRONTEND=noninteractive apt-get -y install \
make cmake gcc gdb strace valgrind \
......
......@@ -15,6 +15,7 @@
# Create a minimal docker image containing OpenZGY
FROM ubuntu:focal
ARG TOUCH=1
RUN apt-get update; apt-get -y install libssl1.1 libcurl4 python3 python3-pip
WORKDIR /home/build/oz
ADD deploy.tgz build/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment