summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cirrus.yml10
-rw-r--r--build/ci/cirrus_ci/Dockerfile.fc30 (renamed from build/ci/cirrus_ci/Dockerfile.fc29)2
-rw-r--r--build/ci/cirrus_ci/Dockerfile.fc30.distcheck (renamed from build/ci/cirrus_ci/Dockerfile.fc29.distcheck)2
3 files changed, 6 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 21044fff..33d6e473 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
index d88176b1..2085d467 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
index 4470b5c3..b59044be 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