Skip to content
Snippets Groups Projects
Commit 7cbec739 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

GitLab CI: do not checkout own copy of vcpkg, use the one that comes with the builder image

parent fa4924bc
No related branches found
No related tags found
No related merge requests found
...@@ -21,11 +21,6 @@ Windows x64: ...@@ -21,11 +21,6 @@ Windows x64:
- build/apt-cache - build/apt-cache
unprotect: true unprotect: true
- key: vcpkg-root
paths:
- build/vcpkg-root
unprotect: true
- key: vcpkg-binary-cache-x64-mingw-static - key: vcpkg-binary-cache-x64-mingw-static
paths: paths:
- build/vcpkg-binary-cache - build/vcpkg-binary-cache
...@@ -46,20 +41,9 @@ Windows x64: ...@@ -46,20 +41,9 @@ Windows x64:
script: script:
- | - |
# vcpkg # vcpkg
echo -e "\e[0Ksection_start:`date +%s`:vcpkg-root[collapsed=true]\r\e[0KUpdating vcpkg" echo -e "\e[0Ksection_start:`date +%s`:vcpkg-root[collapsed=true]\r\e[0KSetting vcpkg cache"
if [ -d "build/vcpkg-root" ]; then
pushd build/vcpkg-root
git fetch https://github.com/Microsoft/vcpkg master
git reset --hard FETCH_HEAD
popd
else
mkdir -p build
git clone https://github.com/Microsoft/vcpkg build/vcpkg-root
fi
export VCPKG_ROOT=$(pwd)/build/vcpkg-root export VCPKG_DEFAULT_BINARY_CACHE="$(pwd)/build/vcpkg-binary-cache"
export VCPKG_BINARY_SOURCES="clear;files,/opt/vcpkg.bsources,read;files,$(pwd)/build/vcpkg-binary-cache,readwrite"
mkdir -p "build/vcpkg-binary-cache" mkdir -p "build/vcpkg-binary-cache"
...@@ -106,18 +90,6 @@ Windows x64: ...@@ -106,18 +90,6 @@ Windows x64:
# apt_clean # apt_clean
echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - |
# vcpkg_clean
echo -e "\e[0Ksection_start:`date +%s`:vcpkg_clean[collapsed=true]\r\e[0KCleaning vcpkg-root"
if [ -d "build/vcpkg-root" ]; then
pushd "build/vcpkg-root"
git clean -f
popd
fi
echo -e "\e[0Ksection_end:`date +%s`:vcpkg_clean\r\e[0K"
- - | - - |
# ccache_stats # ccache_stats
echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
......
...@@ -17,11 +17,6 @@ Windows x86: ...@@ -17,11 +17,6 @@ Windows x86:
- build/apt-cache - build/apt-cache
unprotect: true unprotect: true
- key: vcpkg-root
paths:
- build/vcpkg-root
unprotect: true
- key: vcpkg-binary-cache-x86-mingw-static - key: vcpkg-binary-cache-x86-mingw-static
paths: paths:
- build/vcpkg-binary-cache - build/vcpkg-binary-cache
...@@ -42,20 +37,9 @@ Windows x86: ...@@ -42,20 +37,9 @@ Windows x86:
script: script:
- | - |
# vcpkg # vcpkg
echo -e "\e[0Ksection_start:`date +%s`:vcpkg-root[collapsed=true]\r\e[0KUpdating vcpkg" echo -e "\e[0Ksection_start:`date +%s`:vcpkg-root[collapsed=true]\r\e[0KSetting vcpkg cache"
if [ -d "build/vcpkg-root" ]; then
pushd build/vcpkg-root
git fetch https://github.com/Microsoft/vcpkg master
git reset --hard FETCH_HEAD
popd
else
mkdir -p build
git clone https://github.com/Microsoft/vcpkg build/vcpkg-root
fi
export VCPKG_ROOT=$(pwd)/build/vcpkg-root export VCPKG_DEFAULT_BINARY_CACHE="$(pwd)/build/vcpkg-binary-cache"
export VCPKG_BINARY_SOURCES="clear;files,/opt/vcpkg.bsources,read;files,$(pwd)/build/vcpkg-binary-cache,readwrite"
mkdir -p "build/vcpkg-binary-cache" mkdir -p "build/vcpkg-binary-cache"
...@@ -102,18 +86,6 @@ Windows x86: ...@@ -102,18 +86,6 @@ Windows x86:
# apt_clean # apt_clean
echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
- - |
# vcpkg_clean
echo -e "\e[0Ksection_start:`date +%s`:vcpkg_clean[collapsed=true]\r\e[0KCleaning vcpkg-root"
if [ -d "build/vcpkg-root" ]; then
pushd "build/vcpkg-root"
git clean -f
popd
fi
echo -e "\e[0Ksection_end:`date +%s`:vcpkg_clean\r\e[0K"
- - | - - |
# ccache_stats # ccache_stats
echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:" echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment