Update to Ubuntu 20

Previously, our supported Ubuntu version was 18.04. This commit upgrades us to using Ubuntu 20. New ci docker images have been built and pushed already.
ponylang · Apr 23, 2020 · d966c45 · d966c45
1 parent 0ba1d6a
commit d966c45
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 37 deletions.
diff --git a/.ci-dockerfiles/cross-aarch64/Dockerfile b/.ci-dockerfiles/cross-aarch64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+FROM ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
 
 ARG CROSS_TRIPLE=aarch64-unknown-linux-gnu
 ARG CROSS_CC=aarch64-linux-gnu-gcc

diff --git a/.ci-dockerfiles/cross-aarch64/build-and-push.bash b/.ci-dockerfiles/cross-aarch64/build-and-push.bash
@@ -7,9 +7,9 @@ set -o nounset
 # *** You should already be logged in to DockerHub when you run this ***
 #
 
+NAME="ponylang/ponyc-ci-cross-aarch64"
 TODAY=$(date +%Y%m%d)
 DOCKERFILE_DIR="$(dirname "$0")"
 
-docker build --pull -t "ponylang/ponyc-ci-cross-aarch64:${TODAY}" \
-  "${DOCKERFILE_DIR}"
-docker push "ponylang/ponyc-ci-cross-aarch64:${TODAY}"
+docker build --pull -t "${NAME}:${TODAY}" "${DOCKERFILE_DIR}"
+docker push "${NAME}:${TODAY}"
diff --git a/.ci-dockerfiles/cross-arm/Dockerfile b/.ci-dockerfiles/cross-arm/Dockerfile
@@ -1,4 +1,4 @@
-FROM ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+FROM ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
 
 ARG CROSS_TRIPLE=arm-unknown-linux-gnueabi
 ARG CROSS_CC=arm-linux-gnueabi-gcc

diff --git a/.ci-dockerfiles/cross-arm/build-and-push.bash b/.ci-dockerfiles/cross-arm/build-and-push.bash
@@ -7,9 +7,9 @@ set -o nounset
 # *** You should already be logged in to DockerHub when you run this ***
 #
 
+NAME="ponylang/ponyc-ci-cross-arm"
 TODAY=$(date +%Y%m%d)
 DOCKERFILE_DIR="$(dirname "$0")"
 
-docker build --pull -t "ponylang/ponyc-ci-cross-arm:${TODAY}" \
-  "${DOCKERFILE_DIR}"
-docker push "ponylang/ponyc-ci-cross-arm:${TODAY}"
+docker build --pull -t "${NAME}:${TODAY}" "${DOCKERFILE_DIR}"
+docker push "${NAME}:${TODAY}"
diff --git a/.ci-dockerfiles/cross-armhf/Dockerfile b/.ci-dockerfiles/cross-armhf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+FROM ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
 
 ARG CROSS_TRIPLE=arm-unknown-linux-gnueabihf
 ARG CROSS_CC=arm-linux-gnueabihf-gcc

diff --git a/.ci-dockerfiles/cross-armhf/build-and-push.bash b/.ci-dockerfiles/cross-armhf/build-and-push.bash
@@ -7,9 +7,9 @@ set -o nounset
 # *** You should already be logged in to DockerHub when you run this ***
 #
 
+NAME="ponylang/ponyc-ci-cross-armhf"
 TODAY=$(date +%Y%m%d)
 DOCKERFILE_DIR="$(dirname "$0")"
 
-docker build --pull -t "ponylang/ponyc-ci-cross-armhf:${TODAY}" \
-  "${DOCKERFILE_DIR}"
-docker push "ponylang/ponyc-ci-cross-armhf:${TODAY}"
+docker build --pull -t "${NAME}:${TODAY}" "${DOCKERFILE_DIR}"
+docker push "${NAME}:${TODAY}"
diff --git a/.ci-dockerfiles/x86-64-unknown-linux-gnu-builder/Dockerfile b/.ci-dockerfiles/x86-64-unknown-linux-gnu-builder/Dockerfile
@@ -1,25 +1,26 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+# Keep annoying tzdata prompt from coming up
+# Thanks cmake!
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
 
 RUN apt-get update \
  && apt-get install -y \
   apt-transport-https \
   build-essential \
   clang \
-  g++-6 \
+  cmake \
   git \
   make \
   xz-utils \
   zlib1g-dev \
-  python-pip \
   curl \
+  python3-pip \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get -y autoremove --purge \
  && apt-get -y clean \
- && pip install cloudsmith-cli
-
-# install a newer cmake
-RUN curl --output cmake-3.15.3-Linux-x86_64.sh https://cmake.org/files/v3.15/cmake-3.15.3-Linux-x86_64.sh \
- && sh cmake-3.15.3-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir
+ && pip3 install cloudsmith-cli
 
 # add user pony in order to not run tests as root
 RUN useradd -ms /bin/bash -d /home/pony -g root pony

diff --git a/.ci-dockerfiles/x86-64-unknown-linux-gnu-builder/build-and-push.bash b/.ci-dockerfiles/x86-64-unknown-linux-gnu-builder/build-and-push.bash
@@ -7,9 +7,9 @@ set -o nounset
 # *** You should already be logged in to DockerHub when you run this ***
 #
 
+NAME="ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder"
 TODAY=$(date +%Y%m%d)
 DOCKERFILE_DIR="$(dirname "$0")"
 
-docker build --pull -t "ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:${TODAY}" \
-  "${DOCKERFILE_DIR}"
-docker push "ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:${TODAY}"
+docker build --pull -t "${NAME}:${TODAY}" "${DOCKERFILE_DIR}"
+docker push "${NAME}:${TODAY}"
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,7 +6,7 @@ task:
   only_if: $CIRRUS_CRON == "master-midnight"
 
   container:
-    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
     cpu: 8
     memory: 24
 
@@ -17,7 +17,7 @@ task:
 
   libs_cache:
     folder: build/libs
-    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc"
+    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc 20200423"
     populate_script: make libs build_flags=-j8
 
   nightly_script:
@@ -136,7 +136,7 @@ task:
   only_if: $CIRRUS_TAG =~ '^\d+\.\d+\.\d+$'
 
   container:
-    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
     cpu: 8
     memory: 24
 
@@ -147,7 +147,7 @@ task:
 
   libs_cache:
     folder: build/libs
-    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc"
+    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc 20200423"
     populate_script: make libs build_flags=-j8
 
   release_script:
@@ -237,15 +237,15 @@ task:
   only_if: $CIRRUS_PR != ''
 
   container:
-    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
     cpu: 8
     memory: 24
 
   name: "PR: x86-64-unknown-linux-gnu"
 
   libs_cache:
     folder: build/libs
-    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc"
+    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc 20200423"
     populate_script: make libs arch=x86-64 build_flags=-j8
 
   configure_script:
@@ -259,15 +259,15 @@ task:
   only_if: $CIRRUS_PR != ''
 
   container:
-    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200419
+    image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
     cpu: 8
     memory: 24
 
   name: "PR: x86-64-unknown-linux-gnu [debug]"
 
   libs_cache:
     folder: build/libs
-    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc"
+    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` glibc 20200423"
     populate_script: make libs arch=x86-64 build_flags=-j8
 
   configure_script:
@@ -407,15 +407,15 @@ task:
   only_if: $CIRRUS_PR != ''
 
   container:
-    image: ponylang/ponyc-ci-cross-arm:20200419
+    image: ponylang/ponyc-ci-cross-arm:20200423
     cpu: 8
     memory: 24
 
   name: "PR: cross-compile: arm-unknown-linux-gnueabi"
 
   libs_cache:
     folder: build/libs
-    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` cross arm"
+    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` cross arm 20200423"
     populate_script: make libs build_flags=-j8 llvm_archs="X86;ARM"
 
   configure_script:
@@ -433,15 +433,15 @@ task:
   only_if: $CIRRUS_PR != ''
 
   container:
-    image: ponylang/ponyc-ci-cross-armhf:20200419
+    image: ponylang/ponyc-ci-cross-armhf:20200423
     cpu: 8
     memory: 24
 
   name: "PR: cross-compile: arm-linux-gnueabihf-gcc"
 
   libs_cache:
     folder: build/libs
-    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` cross arm"
+    fingerprint_script: echo "`md5sum lib/CMakeLists.txt` cross arm 20200423"
     populate_script: make libs build_flags=-j8 llvm_archs="X86;ARM"
 
   configure_script:

diff --git a/.dockerfiles/latest/x86-64-unknown-linux-gnu/Dockerfile b/.dockerfiles/latest/x86-64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV PATH "/root/.local/share/ponyup/bin:$PATH"
 

diff --git a/.dockerfiles/release/x86-64-unknown-linux-gnu/Dockerfile b/.dockerfiles/release/x86-64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV PATH "/root/.local/share/ponyup/bin:$PATH"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,8 @@ All notable changes to the Pony compiler and standard library will be documented
 - Update  supported FreeBSD version to 12.1 ([PR #3495](https://github.com/ponylang/ponyc/pull/3495))
 - Make clang our default compiler on Linux, macOS, and FreeBSD ([PR #3506](https://github.com/ponylang/ponyc/pull/3506))
 - schedule the cycle detector with higher priority using the inject queue ([PR #3507](https://github.com/ponylang/ponyc/pull/3507))
+- Update glibc Docker image based to Ubuntu 20 ([PR #3522](https://github.com/ponylang/ponyc/pull/3522))
+- Change supported Ubuntu version to Ubuntu 20 ([PR #3522](https://github.com/ponylang/ponyc/pull/3522))
 
 ## [0.33.2] - 2020-02-03