produce output for linux, don't overwrite docker images between distros

Author: arifogel

README.batfish

@@ -0,0 +1,16 @@
+To generate zips on your local machine, do:
+
+## Ubuntu 14,04 (USES DOCKER)
+LINUX_BASE=ubuntu_14.04 TRAVIS_OS_NAME=linux contrib/ci/scripts/travis_ci_entry_point.sh
+
+## Ubuntu 16,04 (USES DOCKER)
+LINUX_BASE=ubuntu_16.04 TRAVIS_OS_NAME=linux contrib/ci/scripts/travis_ci_entry_point.sh
+
+## OSX with OpenMP (RECOMMENDED, MUST BE RUN ON OSX, DOES NOT USE DOCKER)
+./package_z3_osx_openmp.sh
+
+## OSX without OpenMP (NOT RECOMMENDED, MUST BE RUN ON OSX, DOES NOT USE DOCKER)
+./package_z3_osx.sh
+
+
+Output zips are placed in build/generated-packages/

common.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+z3_git_version() {
+  if [ -n "${Z3_GIT_VERSION}" ]; then
+    echo "${Z3_GIT_VERSION}"
+  else
+    COMMIT_HASH="$(git rev-parse HEAD)"
+    if [ -z "${COMMIT_HASH}" ]; then
+       echo "Not a git repository" 1>&2
+       exit 1
+    fi
+    COMMIT_DATE="$(git show -s --format=%ci | awk '{ print $1 }')"
+    echo "${COMMIT_DATE}-${COMMIT_HASH}"
+  fi
+}
+

contrib/ci/Dockerfiles/z3_build.Dockerfile

@@ -7,7 +7,6 @@ ARG ASAN_BUILD
 ARG ASAN_DSO
 ARG BUILD_DOCS
 ARG CC
-ARG COMMIT_HASH
 ARG CXX
 ARG DOTNET_BINDINGS
 ARG JAVA_BINDINGS
@@ -27,6 +26,7 @@ ARG USE_OPENMP
 ARG Z3_SRC_DIR=/home/user/z3_src
 ARG Z3_BUILD_TYPE
 ARG Z3_CMAKE_GENERATOR
+ARG Z3_GIT_VERSION
 ARG Z3_INSTALL_PREFIX
 ARG Z3_STATIC_BUILD
 ARG Z3_SYSTEM_TEST_GIT_REVISION
@@ -35,7 +35,7 @@ ARG Z3_VERBOSE_BUILD_OUTPUT
 
 ENV \
   CC=${CC} \
-  COMMIT_HASH=${COMMIT_HASH} \
+  Z3_GIT_VERSION=${Z3_GIT_VERSION} \
   CXX=${CXX} \
   Z3_SRC_DIR=${Z3_SRC_DIR} \
   Z3_BUILD_DIR=/home/user/z3_build \
@@ -49,6 +49,8 @@ ADD --chown=user /examples ${Z3_SRC_DIR}/examples/
 ADD --chown=user /scripts ${Z3_SRC_DIR}/scripts/
 ADD --chown=user /src ${Z3_SRC_DIR}/src/
 ADD --chown=user *.txt *.md RELEASE_NOTES ${Z3_SRC_DIR}/
+ADD --chown=user /linux_common.sh ${Z3_SRC_DIR}/
+ADD --chown=user /common.sh ${Z3_SRC_DIR}/
 ADD --chown=user /package_z3_linux.sh ${Z3_SRC_DIR}/
 RUN ${Z3_SRC_DIR}/package_z3_linux.sh
 

contrib/ci/scripts/travis_ci_linux_entry_point.sh

@@ -6,6 +6,12 @@ set -x
 set -e
 set -o pipefail
 
+REPO_ROOT="${SCRIPT_DIR}/../../.."
+. "${REPO_ROOT}/common.sh"
+Z3_GIT_VERSION="$(z3_git_version)"
+PACKAGE_OUTPUT_DIR="${REPO_ROOT}/build/generated-packages"
+mkdir -p "${PACKAGE_OUTPUT_DIR}"
+
 DOCKER_FILE_DIR="$(cd ${SCRIPT_DIR}/../Dockerfiles; echo $PWD)"
 
 : ${LINUX_BASE?"LINUX_BASE must be specified"}
@@ -71,7 +77,7 @@ if [ -n "${C_COMPILER}" ]; then
   BUILD_OPTS+=("--build-arg" "CC=${C_COMPILER}")
 fi
 
-BUILD_OPTS+=("--build-arg" "COMMIT_HASH=$(git rev-parse HEAD)")
+BUILD_OPTS+=("--build-arg" "Z3_GIT_VERSION=${Z3_GIT_VERSION}")
 
 # TravisCI reserves CXX for itself so use a different name
 if [ -n "${CXX_COMPILER}" ]; then
@@ -224,7 +230,13 @@ else
 fi
 
 # Now build Z3 and test it using the created base image
+export POSTBUILD_IMAGE="batfish/z3-docker-postbuild-$(echo "${LINUX_BASE}" | tr -d '.')"
 docker build \
+  -t "${POSTBUILD_IMAGE}" \
   -f "${DOCKER_BUILD_FILE}" \
   "${BUILD_OPTS[@]}" \
   .
+DOCKER_REPO_ROOT="/home/user/z3_src"
+Z3_ZIP="$(docker run "${POSTBUILD_IMAGE}" /bin/bash -c ". ${DOCKER_REPO_ROOT}/linux_common.sh && linux_zip_name")"
+docker cp "$(docker create "${POSTBUILD_IMAGE}"):${DOCKER_REPO_ROOT}/build/generated-packages/${Z3_ZIP}" "${PACKAGE_OUTPUT_DIR}/"
+

linux_common.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+REPO_ROOT="$( cd ${BASH_SOURCE[0]%/*} ; echo $PWD )"
+. "${REPO_ROOT}/common.sh"
+
+z3_version() {
+  local UBUNTU_VERSION_STRING="x64-ubuntu-$(lsb_release -rs)"
+  echo "z3-${Z3_GIT_VERSION}-${UBUNTU_VERSION_STRING}"
+}
+
+ubuntu_zip_name() {
+  echo "$(z3_version).zip"
+}
+
+linux_zip_name() {
+  Z3_GIT_VERSION="$(z3_git_version)"
+  PLATFORM_STRING="$(python -mplatform)"
+  if [[ "${PLATFORM_STRING}" = *"Ubuntu"* ]]; then
+     ubuntu_zip_name
+  else
+     echo "Unsupported platform: ${PLATFORM_STRING}" 1>&2
+     exit 1
+  fi
+}
+

package_z3_linux.sh

@@ -1,44 +1,5 @@
 #!/usr/bin/env bash
-
-build_z3() {
-   cd "${REPO_ROOT}"
-   rm -rf build
-   python scripts/mk_make.py --java
-   cd build
-   BUILD_DIR="${PWD}"
-   make -j$(grep -i processor /proc/cpuinfo | wc -l)
-   WORKING="$(mktemp -d)"
-   cd "${WORKING}"
-   umask 0022
-   mkdir -p "${Z3_VERSION}/bin" "${Z3_VERSION}/lib"
-   cp "${BUILD_DIR}/z3" "${Z3_VERSION}/bin/z3"
-   chmod 0755 "${Z3_VERSION}/bin/z3"
-   cp "${BUILD_DIR}/libz3.so" "${Z3_VERSION}/lib/libz3.so"
-   chmod 0644 "${Z3_VERSION}/lib/libz3.so"
-   cp "${BUILD_DIR}/libz3java.so" "${Z3_VERSION}/lib/libz3java.so"
-   chmod 0644 "${Z3_VERSION}/lib/libz3java.so"
-   cp "${BUILD_DIR}/../LICENSE.txt" "${Z3_VERSION}/LICENSE"
-   chmod 0644 "${Z3_VERSION}/LICENSE"
-   zip -r "${BUILD_DIR}/${Z3_ZIP}" "${Z3_VERSION}"
-   cd "${BUILD_DIR}"
-   rm -rf "${WORKING}"
-}
-
-package_z3_ubuntu() {
-   UBUNTU_VERSION_STRING="x64-ubuntu-$(lsb_release -rs)"
-   Z3_VERSION="z3-${VERSION}-${UBUNTU_VERSION_STRING}"
-   Z3_ZIP="${Z3_VERSION}.zip"
-   build_z3
-}
-
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE}")" && pwd)"
-if [ -z "${COMMIT_HASH}" ]; then
-  COMMIT_HASH="$(git rev-parse HEAD)"
-fi
-if [ -z "${COMMIT_HASH}" ]; then
-   echo "Not a git repository" 1>&2
-   exit 1
-fi
 if ! which python2.7; then
    echo Missing python2.7 1>&2
    exit 1
@@ -55,12 +16,33 @@ OLD_PWD="${PWD}"
 OLD_UMASK="$(umask)"
 set -x
 set -e
-VERSION="$(date "+%Y-%m-%d")-${COMMIT_HASH}"
-PLATFORM_STRING="$(python -mplatform)"
-if [[ "${PLATFORM_STRING}" = *"Ubuntu"* ]]; then
-   package_z3_ubuntu
-else
-   echo "Unsupported platform: ${PLATFORM_STRING}" 1>&2
-   exit 1
+. "${REPO_ROOT}/linux_common.sh"
+Z3_ZIP="$(linux_zip_name)"
+if [ -z "${Z3_ZIP}" ]; then
+  echo "Could not determine name of output zip" 1>&2
+  exit 1
 fi
+cd "${REPO_ROOT}"
+rm -rf build
+python scripts/mk_make.py --java
+cd build
+BUILD_DIR="${PWD}"
+make -j$(grep -i processor /proc/cpuinfo | wc -l)
+WORKING="$(mktemp -d)"
+cd "${WORKING}"
+umask 0022
+Z3_VERSION="$(z3_version)"
+mkdir -p "${Z3_VERSION}/bin" "${Z3_VERSION}/lib"
+cp "${BUILD_DIR}/z3" "${Z3_VERSION}/bin/z3"
+chmod 0755 "${Z3_VERSION}/bin/z3"
+cp "${BUILD_DIR}/libz3.so" "${Z3_VERSION}/lib/libz3.so"
+chmod 0644 "${Z3_VERSION}/lib/libz3.so"
+cp "${BUILD_DIR}/libz3java.so" "${Z3_VERSION}/lib/libz3java.so"
+chmod 0644 "${Z3_VERSION}/lib/libz3java.so"
+cp "${BUILD_DIR}/../LICENSE.txt" "${Z3_VERSION}/LICENSE"
+chmod 0644 "${Z3_VERSION}/LICENSE"
+mkdir -p "${BUILD_DIR}/generated-packages"
+zip -r "${BUILD_DIR}/generated-packages/${Z3_ZIP}" "${Z3_VERSION}"
+cd "${BUILD_DIR}"
+rm -rf "${WORKING}"
 

package_z3_osx.sh

@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE}")" && pwd)"
-COMMIT_HASH="$(git rev-parse HEAD)"
-if [ -z "${COMMIT_HASH}" ]; then
-   echo "Not a git repository" 1>&2
-   exit 1
-fi
+set -x
+set -e
+. "${REPO_ROOT}/common.sh"
+Z3_GIT_VERSION="$(z3_git_version)"
 if ! which python2.7; then
    echo Missing python2.7 1>&2
    exit 1
@@ -19,17 +18,15 @@ if ! which javac; then
 fi
 OLD_PWD="${PWD}"
 OLD_UMASK="$(umask)"
-VERSION="$(date "+%Y-%m-%d")-${COMMIT_HASH}"
+VERSION="${COMMIT_DATE}-${COMMIT_HASH}"
 OSX_VERSION="$(sw_vers | grep ProductVersion | awk '{ print $2; }')"
 if [ -z "${BREW_LLVM_PREFIX}" ]; then
    NO_OPENMP_SUFFIX="-without-openmp"
 else
    NO_OPENMP_SUFFIX=
 fi
-Z3_VERSION="z3-${VERSION}-x64-osx-${OSX_VERSION}${NO_OPENMP_SUFFIX}"
+Z3_VERSION="z3-${Z3_GIT_VERSION}-x64-osx-${OSX_VERSION}${NO_OPENMP_SUFFIX}"
 Z3_ZIP="${Z3_VERSION}.zip"
-set -x
-set -e
 cd "${REPO_ROOT}"
 rm -rf build
 python scripts/mk_make.py --java USE_OPENMP=1
@@ -58,7 +55,8 @@ if [ -n "${BREW_LLVM_PREFIX}" ]; then
   cp "${BREW_LLVM_PREFIX}/lib/libomp.dylib" "${Z3_VERSION}/lib/libomp.dylib"
   chmod 0644 "${Z3_VERSION}/lib/libomp.dylib"
 fi
-zip -r "${BUILD_DIR}/${Z3_ZIP}" "${Z3_VERSION}"
+mkdir -p "${BUILD_DIR}/generated-packages"
+zip -r "${BUILD_DIR}/generated-packages/${Z3_ZIP}" "${Z3_VERSION}"
 cd "${BUILD_DIR}"
 rm -rf "${WORKING}"