CI: upgrade Fedora from 29 to 30, remove unmaintained MacOS High Sierra

diff --git a/.cirrus.yml b/.cirrus.yml
index 21044fff79e0dad5ecda2782260ea11c2f756291..33d6e473d9fab0a7110fca699b897d0bb892bd28 100644 (file)
--- 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 d88176b174d8997c0a2ab90e28c5ddb18c5c4cd1..2085d467b670aed72bcd305c28498bd3e184dce6 100644 (file)
--- 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 4470b5c391685cb5b05de4bf3ed0144a5d4eccc6..b59044be37a8f97c5d5194a868b47001ad5ef7aa 100644 (file)
--- 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