From a163558c388bb2ccedef683e8031c11193e6875c Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 17 Jun 2019 15:19:53 +0200 Subject: [PATCH] CI: upgrade Fedora from 29 to 30, remove unmaintained MacOS High Sierra --- .cirrus.yml | 10 ++++------ .../ci/cirrus_ci/{Dockerfile.fc29 => Dockerfile.fc30} | 2 +- ...erfile.fc29.distcheck => Dockerfile.fc30.distcheck} | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) rename build/ci/cirrus_ci/{Dockerfile.fc29 => Dockerfile.fc30} (93%) rename build/ci/cirrus_ci/{Dockerfile.fc29.distcheck => Dockerfile.fc30.distcheck} (94%) diff --git a/.cirrus.yml b/.cirrus.yml index 21044fff7..33d6e473d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,8 +35,6 @@ MacOS_task: matrix: osx_instance: image: mojave-xcode-10.2 - osx_instance: - image: high-sierra-xcode-10.0 prepare_script: - ./build/ci/cirrus_ci/ci.sh prepare configure_script: @@ -50,9 +48,9 @@ MacOS_task: install_script: - ./build/ci/build.sh -a install -Fedora_29_task: +Fedora_30_task: container: - dockerfile: build/ci/cirrus_ci/Dockerfile.fc29 + dockerfile: build/ci/cirrus_ci/Dockerfile.fc30 matrix: env: BS: autotools @@ -68,9 +66,9 @@ Fedora_29_task: install_script: - ./build/ci/build.sh -a install -Fedora_29_distcheck_task: +Fedora_30_distcheck_task: container: - dockerfile: build/ci/cirrus_ci/Dockerfile.fc29.distcheck + dockerfile: build/ci/cirrus_ci/Dockerfile.fc30.distcheck env: BS: autotools configure_script: diff --git a/build/ci/cirrus_ci/Dockerfile.fc29 b/build/ci/cirrus_ci/Dockerfile.fc30 similarity index 93% rename from build/ci/cirrus_ci/Dockerfile.fc29 rename to build/ci/cirrus_ci/Dockerfile.fc30 index d88176b17..2085d467b 100644 --- a/build/ci/cirrus_ci/Dockerfile.fc29 +++ b/build/ci/cirrus_ci/Dockerfile.fc30 @@ -1,3 +1,3 @@ -FROM fedora:29 +FROM fedora:30 RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel diff --git a/build/ci/cirrus_ci/Dockerfile.fc29.distcheck b/build/ci/cirrus_ci/Dockerfile.fc30.distcheck similarity index 94% rename from build/ci/cirrus_ci/Dockerfile.fc29.distcheck rename to build/ci/cirrus_ci/Dockerfile.fc30.distcheck index 4470b5c39..b59044be3 100644 --- a/build/ci/cirrus_ci/Dockerfile.fc29.distcheck +++ b/build/ci/cirrus_ci/Dockerfile.fc30.distcheck @@ -1,3 +1,3 @@ -FROM fedora:29 +FROM fedora:30 RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript -- 2.47.2