Skip to content

Commit 49970cd

Browse files
committed
[ci] Bump version of the GitLab CI containers and Vagrant boxes
(cherry picked from commit dc338f9)
1 parent ee31327 commit 49970cd

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ stages:
3232
- deploy
3333

3434
Fedora:
35-
image: fedora:28
35+
image: fedora:latest
3636
<<: *default_config
3737
<<: *distro_build
3838

3939
Fedora_MinGW:
40-
image: fedora:29
40+
image: fedora:latest
4141
before_script:
4242
- dnf -y upgrade
4343
- dnf -y install mingw64-gcc-c++ mingw64-filesystem mingw64-expat mingw64-zlib cmake make
@@ -70,7 +70,7 @@ OpenSUSE:
7070
<<: *distro_build
7171

7272
Install:
73-
image: fedora:28
73+
image: fedora:latest
7474
stage: deploy
7575
<<: *default_config
7676
script:
@@ -82,7 +82,7 @@ Install:
8282
- EXIV2_BINDIR=/usr/bin/ make tests
8383

8484
pages:
85-
image: fedora:28
85+
image: fedora:latest
8686
stage: deploy
8787
<<: *default_config
8888
script:

ci/install_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ distro_id=$(grep '^ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g')
2424

2525
case "$distro_id" in
2626
'fedora')
27-
dnf -y --refresh install gcc-c++ clang cmake make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which dos2unix
27+
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
2828
;;
2929

3030
'debian')

contrib/vms/Vagrantfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Vagrant.configure("2") do |config|
22

33
config.vm.define "Fedora" do |fedora|
4-
fedora.vm.box = "fedora/28-cloud-base"
5-
fedora.vm.hostname = "Fedora-exiv2"
4+
fedora.vm.box = "fedora/30-cloud-base"
5+
fedora.vm.hostname = "fedora-exiv2"
66
end
77

88
config.vm.define "Debian" do |debian|
9-
debian.vm.box = "generic/debian9"
9+
debian.vm.box = "generic/debian10"
1010
debian.vm.hostname = "debian-exiv2"
1111
end
1212

@@ -25,8 +25,8 @@ Vagrant.configure("2") do |config|
2525
centos.vm.hostname = "centos-exiv2"
2626
end
2727

28-
config.vm.define "OpenSUSE" do |opensuse|
29-
opensuse.vm.box = "opensuse/openSUSE-Tumbleweed-x86_64"
28+
config.vm.define "openSUSE" do |opensuse|
29+
opensuse.vm.box = "opensuse/openSUSE-Tumbleweed-Vagrant.x86_64"
3030
opensuse.vm.hostname = "opensuse-exiv2"
3131
end
3232

0 commit comments

Comments
 (0)