Skip to content

Bump ci containers #1002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2019
Merged

Bump ci containers #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc338f9
[ci] Bump version of the GitLab CI containers and Vagrant boxes
D4N Sep 18, 2019
e22c97e
[ci] Stop symlinking python36 to python3 on CentOS
D4N Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ stages:
- deploy

Fedora:
image: fedora:29
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
Expand Down Expand Up @@ -71,12 +71,12 @@ OpenSUSE:
<<: *distro_build

Alpine:
image: alpine:3.9
image: alpine:latest
<<: *default_config
<<: *distro_build

Install:
image: fedora:29
image: fedora:latest
stage: deploy
<<: *default_config
script:
Expand All @@ -88,7 +88,7 @@ Install:
- EXIV2_BINDIR=/usr/bin/ make tests

pages:
image: fedora:29
image: fedora:latest
stage: deploy
<<: *default_config
script:
Expand Down
12 changes: 3 additions & 9 deletions ci/install_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 gmock-devel which dos2unix
dnf -y --refresh install gcc-c++ clang cmake make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel gmock-devel which dos2unix glibc-langpack-en
;;

'debian')
Expand All @@ -50,7 +50,7 @@ case "$distro_id" in
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 devtoolset-3-gcc-c++ devtoolset-3-gcc-c++ devtoolset-3-binutils clang cmake3 make ccache \
expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel gmock-devel which python36 dos2unix
expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel gmock-devel which python3 dos2unix
echo source /opt/rh/devtoolset-3/enable >> ~/.bash_profile
echo export CCACHE_PATH=$HOME/bin:$PATH >> ~/.bash_profile
mkdir ~/bin
Expand All @@ -63,13 +63,7 @@ EOF
/usr/bin/clang --gcc-toolchain=/opt/rh/devtoolset-3/root/ \$@
EOF
chmod +x ~/bin/clang*
# 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
# symlink up to date version of cmake to the 'default' name
mv /bin/cmake /bin/.cmake.old
ln -s /bin/cmake3 /bin/cmake
;;
Expand Down
8 changes: 4 additions & 4 deletions contrib/vms/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Vagrant.configure("2") do |config|
config.vm.synced_folder ".", "/vagrant", disabled: true

config.vm.define "Fedora" do |fedora|
fedora.vm.box = "fedora/29-cloud-base"
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

Expand All @@ -27,8 +27,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

Expand Down