[ci] Bump version of the GitLab CI containers and Vagrant boxes
(cherry picked from commit dc338f9341925740a2f4903a62e0aba3cc0bf722)
This commit is contained in:
parent
ee31327551
commit
49970cd820
@ -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:
|
||||
|
||||
@ -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')
|
||||
|
||||
10
contrib/vms/Vagrantfile
vendored
10
contrib/vms/Vagrantfile
vendored
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user