From 737f9cf0121eaf33c8631d8cb2e59a7103bb7e16 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sun, 15 Jan 2023 12:37:14 +0100 Subject: [PATCH] Revert "CI: disable Cygwin jobs" This reverts commit 709acef44e13332a3c961bed3a2478c002f7b25f. --- .gitlab-ci.yml | 182 ++++++++++++++++++++++++------------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 347379881..760205665 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -612,67 +612,67 @@ windows-mingw32-static-build-step2-make: except: - tags -# windows-cygwin-build: -# stage: build -# needs: -# - job: portable-source -# artifacts: true -# script: -# # disable Windows Defender -# - Add-MpPreference -ExclusionPath 'C:\' -# - 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:\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 -# paths: -# - GRAPHVIZ_VERSION -# - Packages/*/*/*.xz -# cache: -# key: windows-cygwin-build -# paths: -# - ccache-cache -# tags: -# - windows -# except: -# - tags -# -# windows-cygwin-build-using-autogen: -# stage: build -# needs: [] -# script: -# # disable Windows Defender -# - Add-MpPreference -ExclusionPath 'C:\' -# - 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:\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 -# paths: -# - Packages/*/*/*.xz -# cache: -# key: windows-cygwin-build-using-autogen -# paths: -# - ccache-cache -# tags: -# - windows -# except: -# - tags +windows-cygwin-build: + stage: build + needs: + - job: portable-source + artifacts: true + script: + # disable Windows Defender + - Add-MpPreference -ExclusionPath 'C:\' + - 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:\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 + paths: + - GRAPHVIZ_VERSION + - Packages/*/*/*.xz + cache: + key: windows-cygwin-build + paths: + - ccache-cache + tags: + - windows + except: + - tags + +windows-cygwin-build-using-autogen: + stage: build + needs: [] + script: + # disable Windows Defender + - Add-MpPreference -ExclusionPath 'C:\' + - 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:\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 + paths: + - Packages/*/*/*.xz + cache: + key: windows-cygwin-build-using-autogen + paths: + - ccache-cache + tags: + - windows + except: + - tags ubuntu-18.04-cmake-build: <<: *deb_build_definition @@ -967,36 +967,36 @@ windows-mingw64-cmake-build: except: - tags -# windows-cygwin-cmake-build: -# stage: build -# needs: [] -# script: -# # disable Windows Defender -# - Add-MpPreference -ExclusionPath 'C:\' -# - 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:\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 -# paths: -# - Packages/*/*/*.zip -# - Packages/*/*/*.bz2 -# cache: -# key: windows-cygwin-cmake-build -# paths: -# - ccache-cache -# tags: -# - windows -# except: -# - tags +windows-cygwin-cmake-build: + stage: build + needs: [] + script: + # disable Windows Defender + - Add-MpPreference -ExclusionPath 'C:\' + - 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:\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 + paths: + - Packages/*/*/*.zip + - Packages/*/*/*.bz2 + cache: + key: windows-cygwin-cmake-build + paths: + - ccache-cache + tags: + - windows + except: + - tags meta-data: stage: test -- 2.50.1