From 0843a4f81ba2686c7c776c42db7efd0c07062126 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sun, 9 Jan 2022 23:40:41 +0100 Subject: [PATCH] ci: install cygwin from cygwin.com instead of with choco --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- ci/cygwin-build.sh | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22763b53a..26feecef9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -556,12 +556,13 @@ windows-cygwin-build: script: # disable Windows Defender - Add-MpPreference -ExclusionPath 'C:\' - - choco config set cacheLocation choco-cache - - choco install --yes --no-progress cygwin + - wget https://cygwin.com/setup-x86_64.exe -OutFile C:\setup-x86_64.exe + - Start-Process "C:\setup-x86_64.exe" -ArgumentList "--quiet-mode --site https://mirrors.kernel.org/sourceware/cygwin --wait" -wait + - $env:Path = "C:\cygwin64\bin;" + $env:Path - $Env:build_system = "autotools" # change line endings from crlf to lf - - C:\tools\cygwin\bin\sed -i 's/\r//g' ci/*.sh - - C:\tools\cygwin\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh' + - C:\cygwin64\bin\sed -i 's/\r//g' ci/*.sh + - C:\cygwin64\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh' artifacts: when: always expire_in: 1 week @@ -572,7 +573,6 @@ windows-cygwin-build: key: windows-cygwin-build paths: - ccache-cache - - choco-cache tags: - windows except: @@ -584,17 +584,18 @@ windows-cygwin-build-using-autogen: script: # disable Windows Defender - Add-MpPreference -ExclusionPath 'C:\' - - choco config set cacheLocation choco-cache - - choco install --yes --no-progress cygwin + - wget https://cygwin.com/setup-x86_64.exe -OutFile C:\setup-x86_64.exe + - Start-Process "C:\setup-x86_64.exe" -ArgumentList "--quiet-mode --site https://mirrors.kernel.org/sourceware/cygwin --wait" -wait + - $env:Path = "C:\cygwin64\bin;" + $env:Path - nuget install python -ExcludeVersion -OutputDirectory C:\ - $env:Path = "C:\python\tools;" + $env:Path - python gen_version.py --output GRAPHVIZ_VERSION - $Env:build_system = "autotools" - $Env:use_autogen = "yes" # change line endings from crlf to lf - - C:\tools\cygwin\bin\find . '(' -name Makefile.am -or -name "*.def" ')' -exec C:\tools\cygwin\bin\sed -i 's/\r//g' "{}" ';' - - C:\tools\cygwin\bin\sed -i 's/\r//g' autogen.sh ci/*.sh configure.ac lib/common/color_names lib/common/brewer_colors lib/common/svgcolor_names - - C:\tools\cygwin\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh' + - C:\cygwin64\bin\find . '(' -name Makefile.am -or -name "*.def" ')' -exec C:\cygwin64\bin\sed -i 's/\r//g' "{}" ';' + - C:\cygwin64\bin\sed -i 's/\r//g' autogen.sh ci/*.sh configure.ac lib/common/color_names lib/common/brewer_colors lib/common/svgcolor_names + - C:\cygwin64\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh' artifacts: when: always expire_in: 1 week @@ -604,7 +605,6 @@ windows-cygwin-build-using-autogen: key: windows-cygwin-build-using-autogen paths: - ccache-cache - - choco-cache tags: - windows except: @@ -919,15 +919,16 @@ windows-cygwin-cmake-build: script: # disable Windows Defender - Add-MpPreference -ExclusionPath 'C:\' - - choco config set cacheLocation choco-cache - - choco install --yes --no-progress cygwin + - wget https://cygwin.com/setup-x86_64.exe -OutFile C:\setup-x86_64.exe + - Start-Process "C:\setup-x86_64.exe" -ArgumentList "--quiet-mode --site https://mirrors.kernel.org/sourceware/cygwin --wait" -wait + - $env:Path = "C:\cygwin64\bin;" + $env:Path - $Env:build_system = "cmake" # fail on any compiler warnings - $Env:CFLAGS = "-Werror" - $Env:CXXFLAGS = "-Werror" # change line endings from crlf to lf - - C:\tools\cygwin\bin\sed -i 's/\r//g' ci/*.sh lib/common/color_names lib/common/brewer_colors lib/common/svgcolor_names - - C:\tools\cygwin\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh' + - C:\cygwin64\bin\sed -i 's/\r//g' ci/*.sh lib/common/color_names lib/common/brewer_colors lib/common/svgcolor_names + - C:\cygwin64\bin\bash -l -c 'cd $CI_PROJECT_DIR && ci/cygwin-build.sh' artifacts: when: always expire_in: 1 week @@ -938,7 +939,6 @@ windows-cygwin-cmake-build: key: windows-cygwin-cmake-build paths: - ccache-cache - - choco-cache tags: - windows except: diff --git a/ci/cygwin-build.sh b/ci/cygwin-build.sh index 866393c5e..542cc0f74 100644 --- a/ci/cygwin-build.sh +++ b/ci/cygwin-build.sh @@ -5,24 +5,24 @@ set -o pipefail set -u set -x -/cygwinsetup.exe --quiet-mode --wait --packages autoconf2.5 -/cygwinsetup.exe --quiet-mode --wait --packages automake -/cygwinsetup.exe --quiet-mode --wait --packages bison -/cygwinsetup.exe --quiet-mode --wait --packages cmake -/cygwinsetup.exe --quiet-mode --wait --packages flex -/cygwinsetup.exe --quiet-mode --wait --packages gcc-core -/cygwinsetup.exe --quiet-mode --wait --packages gcc-g++ -/cygwinsetup.exe --quiet-mode --wait --packages libcairo-devel -/cygwinsetup.exe --quiet-mode --wait --packages libexpat-devel -/cygwinsetup.exe --quiet-mode --wait --packages libpango1.0-devel -/cygwinsetup.exe --quiet-mode --wait --packages libgd-devel -/cygwinsetup.exe --quiet-mode --wait --packages libtool -/cygwinsetup.exe --quiet-mode --wait --packages make -/cygwinsetup.exe --quiet-mode --wait --packages python3 -/cygwinsetup.exe --quiet-mode --wait --packages zlib-devel +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages autoconf2.5 +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages automake +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages bison +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages cmake +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages flex +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages gcc-core +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages gcc-g++ +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages libcairo-devel +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages libexpat-devel +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages libpango1.0-devel +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages libgd-devel +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages libtool +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages make +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages python3 +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages zlib-devel # setup Ccache to accelerate compilation -/cygwinsetup.exe --quiet-mode --wait --packages ccache +/cygdrive/c/setup-x86_64.exe --quiet-mode --wait --packages ccache export CC="ccache ${CC:-cc}" export CXX="ccache ${CXX:-c++}" export CCACHE_DIR=ccache-cache -- 2.40.0