Merge pull request #1012 from Exiv2/mergify/bp/0.27-maintenance/pr-1002

Bump ci containers (bp #1002)

Author: D4N

.gitlab-ci.yml

@@ -32,12 +32,12 @@ stages:
   - deploy
 
 Fedora:
-  image: fedora:28
+  image: fedora:latest
   <<: *default_config
   <<: *distro_build
 
 Fedora_MinGW:
-  image: fedora:29
+  image: fedora:latest
   before_script:
     - dnf -y upgrade
     - dnf -y install mingw64-gcc-c++ mingw64-filesystem mingw64-expat mingw64-zlib cmake make
@@ -70,7 +70,7 @@ OpenSUSE:
   <<: *distro_build
 
 Install:
-  image: fedora:28
+  image: fedora:latest
   stage: deploy
   <<: *default_config
   script:
@@ -82,7 +82,7 @@ Install:
     - EXIV2_BINDIR=/usr/bin/ make tests
 
 pages:
-  image: fedora:28
+  image: fedora:latest
   stage: deploy
   <<: *default_config
   script:

ci/install_dependencies.sh

@@ -24,7 +24,7 @@ distro_id=$(grep '^ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g')
 
 case "$distro_id" in
     'fedora')
-        dnf -y --refresh install gcc-c++ clang cmake make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which dos2unix
+        dnf -y --refresh install gcc-c++ clang cmake make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which dos2unix glibc-langpack-en
         ;;
 
     'debian')
@@ -49,14 +49,8 @@ case "$distro_id" in
         # enable copr for gtest
         curl https://copr.fedorainfracloud.org/coprs/defolos/devel/repo/epel-7/defolos-devel-epel-7.repo > /etc/yum.repos.d/_copr_defolos-devel.repo
         yum clean all
-        yum -y install gcc-c++ clang cmake3 make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python36 dos2unix
-        # symlink up to date versions of python & cmake to 'default' names
-        if [ ! -e /usr/bin/python3 ]; then
-            ln -s /usr/bin/python36 /usr/bin/python3
-        elif [ -L /usr/bin/python3 ]; then
-            rm /usr/bin/python3
-            ln -s /usr/bin/python36 /usr/bin/python3
-        fi
+        yum -y install gcc-c++ clang cmake3 make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python3 dos2unix
+        # symlink up to date versions of cmake to 'default' name
         mv /bin/cmake /bin/.cmake.old
         ln -s /bin/cmake3 /bin/cmake
         ;;

contrib/vms/Vagrantfile

@@ -1,12 +1,12 @@
 Vagrant.configure("2") do |config|
 
   config.vm.define "Fedora" do |fedora|
-    fedora.vm.box = "fedora/28-cloud-base"
-    fedora.vm.hostname = "Fedora-exiv2"
+    fedora.vm.box = "fedora/30-cloud-base"
+    fedora.vm.hostname = "fedora-exiv2"
   end
 
   config.vm.define "Debian" do |debian|
-    debian.vm.box = "generic/debian9"
+    debian.vm.box = "generic/debian10"
     debian.vm.hostname = "debian-exiv2"
   end
 
@@ -25,8 +25,8 @@ Vagrant.configure("2") do |config|
     centos.vm.hostname = "centos-exiv2"
   end
 
-  config.vm.define "OpenSUSE" do |opensuse|
-    opensuse.vm.box = "opensuse/openSUSE-Tumbleweed-x86_64"
+  config.vm.define "openSUSE" do |opensuse|
+    opensuse.vm.box = "opensuse/openSUSE-Tumbleweed-Vagrant.x86_64"
     opensuse.vm.hostname = "opensuse-exiv2"
   end