third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ci] Bump version of the GitLab CI containers and Vagrant boxes

Browse Source 
(cherry picked from commit dc338f9341925740a2f4903a62e0aba3cc0bf722)
This commit is contained in:
Dan Čermák 2019-09-18 23:20:47 +02:00
parent ee31327551
commit 49970cd820
No known key found for this signature in database
GPG Key ID: E632C3380610D1C5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

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

2
ci/install_dependencies.sh
View File

@ -24,7 +24,7 @@ distro_id=$(grep '^ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g')
case "$distro_id" in case "$distro_id" in
'fedora') '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') 'debian')

10
contrib/vms/Vagrantfile vendored
View File

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