Skip to content

Commit 4633254

Browse files
echeranecheran
committed
ICU-22314 Move Cygwin test to post-merge pipeline
1 parent f3e50a7 commit 4633254

File tree

2 files changed

+73
-69
lines changed

2 files changed

+73
-69
lines changed

‎.ci-builds/.azure-pipelines-icu4c.yml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -560,74 +560,6 @@ jobs:
560560
CC: clang
561561
CXX: clang++
562562
#-------------------------------------------------------------------------
563-
- job: ICU4C_Cygwin_GCC_x86_64_Release
564-
displayName: 'C: Cygwin GCC x86_64 Release'
565-
timeoutInMinutes: 50
566-
pool:
567-
vmImage: 'windows-2019'
568-
variables:
569-
ICU_CI_CACHE: c:\icu-ci-cache
570-
CYG_URL: https://cygwin.com/setup-x86_64.exe
571-
CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
572-
CYG_PACKAGES: automake,gcc-core,gcc-g++,make,pkg-config,perl,python3
573-
CYG_ROOT: c:\cygwin-root
574-
CYG_CACHE: '$(ICU_CI_CACHE)\cygwin64-v3'
575-
CYG_CACHED_SETUP: '$(CYG_CACHE)\setup.exe'
576-
CYG_VERSION_KEY: cygwin-3.2
577-
steps:
578-
# Use 'autocrlf input' since checked-in files may already be using CRLF.
579-
- script: |
580-
git config --global core.autocrlf input
581-
displayName: 'Configure Git to checkout with Unix line endings (LF)'
582-
- checkout: self
583-
lfs: true
584-
fetchDepth: 10
585-
# Cache expires after 7 days of no activity.
586-
- task: Cache@2
587-
displayName: 'Restore Cygwin cache'
588-
inputs:
589-
# Use the contents of the file ".azure-pipelines-icu4c.yml" as part of the key, as that contains the list of CYG_PACKAGES.
590-
# Also include the Cygwin version as part of the key. If we want to use a newer version of Cygwin, we can update CYG_VERSION_KEY.
591-
# Note: CYG_VERSION_KEY may become out of sync with (older than) the version we actually use if we update this file
592-
# without updating CYG_VERSION_KEY. Any updates to this file guarantees that we're using the latest version.
593-
key: '"$(CYG_VERSION_KEY)" | .ci-builds/.azure-pipelines-icu4c.yml'
594-
path: "$(CYG_CACHE)"
595-
- task: PowerShell@2
596-
displayName: 'Download Cygwin setup'
597-
inputs:
598-
targetType: inline
599-
script: |
600-
if ( !(Test-Path "${env:CYG_CACHED_SETUP}" -NewerThan (Get-Date).AddDays(-7)) )
601-
{
602-
Write-Host "Cached Cygwin setup does not exist or is older than 7 days, downloading from external site."
603-
604-
New-Item -Force -Type Directory $env:CYG_CACHE
605-
Write-Host "Downloading Cygwin setup..."
606-
607-
$start_time = Get-Date
608-
(New-Object System.Net.WebClient).DownloadFile($env:CYG_URL, $env:CYG_CACHED_SETUP)
609-
610-
Write-Output "Download took: $((Get-Date).Subtract($start_time).Seconds) second(s)."
611-
}
612-
- script: |
613-
%CYG_CACHED_SETUP% --no-verify --quiet-mode --no-shortcuts --no-startmenu --no-desktop --upgrade-also --only-site --site "%CYG_MIRROR%" --root "%CYG_ROOT%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%"
614-
displayName: 'Install Cygwin'
615-
- script: |
616-
%CYG_ROOT%\\bin\\sh -lc 'echo Hello' && %CYG_ROOT%\\bin\\sh -lc 'uname -a'
617-
displayName: 'Check Cygwin environment'
618-
- script: |
619-
%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath \"$(Build.SourcesDirectory)\") && cd icu4c/source && ./runConfigureICU Cygwin && make tests -j -l2.5"
620-
displayName: 'Build ICU (source and test)'
621-
env:
622-
CC: gcc
623-
CXX: g++
624-
- script: |
625-
%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath \"$(Build.SourcesDirectory)\") && cd icu4c/source && make -j -l2.5 check"
626-
displayName: 'Run Tests'
627-
env:
628-
CC: gcc
629-
CXX: g++
630-
#-------------------------------------------------------------------------
631563
- job: ICU4C_icuexportdata_Ubuntu_2204
632564
displayName: 'C: Create Artifacts from icuexportdata'
633565
timeoutInMinutes: 30

‎.ci-builds/.azure-post-merge-tests.yml

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,76 @@ jobs:
6464
inputs:
6565
filename: icu4c/source/samples/all/samplecheck.bat
6666
arguments: '$(arch) $(config)'
67-
#-------------------------------------------------------------------------
67+
#-------------------------------------------------------------------------
68+
69+
#-------------------------------------------------------------------------
70+
# Other C tests
71+
#-------------------------------------------------------------------------
72+
73+
- job: ICU4C_Cygwin_GCC_x86_64_Release
74+
displayName: 'C: Cygwin GCC x86_64 Release'
75+
timeoutInMinutes: 50
76+
pool:
77+
vmImage: 'windows-2019'
78+
variables:
79+
ICU_CI_CACHE: c:\icu-ci-cache
80+
CYG_URL: https://cygwin.com/setup-x86_64.exe
81+
CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
82+
CYG_PACKAGES: automake,gcc-core,gcc-g++,make,pkg-config,perl,python3
83+
CYG_ROOT: c:\cygwin-root
84+
CYG_CACHE: '$(ICU_CI_CACHE)\cygwin64-v3'
85+
CYG_CACHED_SETUP: '$(CYG_CACHE)\setup.exe'
86+
CYG_VERSION_KEY: cygwin-3.2
87+
steps:
88+
# Use 'autocrlf input' since checked-in files may already be using CRLF.
89+
- script: |
90+
git config --global core.autocrlf input
91+
displayName: 'Configure Git to checkout with Unix line endings (LF)'
92+
- checkout: self
93+
lfs: true
94+
fetchDepth: 10
95+
# Cache expires after 7 days of no activity.
96+
- task: Cache@2
97+
displayName: 'Restore Cygwin cache'
98+
inputs:
99+
# Use the contents of the file ".azure-pipelines-icu4c.yml" as part of the key, as that contains the list of CYG_PACKAGES.
100+
# Also include the Cygwin version as part of the key. If we want to use a newer version of Cygwin, we can update CYG_VERSION_KEY.
101+
# Note: CYG_VERSION_KEY may become out of sync with (older than) the version we actually use if we update this file
102+
# without updating CYG_VERSION_KEY. Any updates to this file guarantees that we're using the latest version.
103+
key: '"$(CYG_VERSION_KEY)" | .ci-builds/.azure-pipelines-icu4c.yml'
104+
path: "$(CYG_CACHE)"
105+
- task: PowerShell@2
106+
displayName: 'Download Cygwin setup'
107+
inputs:
108+
targetType: inline
109+
script: |
110+
if ( !(Test-Path "${env:CYG_CACHED_SETUP}" -NewerThan (Get-Date).AddDays(-7)) )
111+
{
112+
Write-Host "Cached Cygwin setup does not exist or is older than 7 days, downloading from external site."
113+
114+
New-Item -Force -Type Directory $env:CYG_CACHE
115+
Write-Host "Downloading Cygwin setup..."
116+
117+
$start_time = Get-Date
118+
(New-Object System.Net.WebClient).DownloadFile($env:CYG_URL, $env:CYG_CACHED_SETUP)
119+
120+
Write-Output "Download took: $((Get-Date).Subtract($start_time).Seconds) second(s)."
121+
}
122+
- script: |
123+
%CYG_CACHED_SETUP% --no-verify --quiet-mode --no-shortcuts --no-startmenu --no-desktop --upgrade-also --only-site --site "%CYG_MIRROR%" --root "%CYG_ROOT%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%"
124+
displayName: 'Install Cygwin'
125+
- script: |
126+
%CYG_ROOT%\\bin\\sh -lc 'echo Hello' && %CYG_ROOT%\\bin\\sh -lc 'uname -a'
127+
displayName: 'Check Cygwin environment'
128+
- script: |
129+
%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath \"$(Build.SourcesDirectory)\") && cd icu4c/source && ./runConfigureICU Cygwin && make tests -j -l2.5"
130+
displayName: 'Build ICU (source and test)'
131+
env:
132+
CC: gcc
133+
CXX: g++
134+
- script: |
135+
%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath \"$(Build.SourcesDirectory)\") && cd icu4c/source && make -j -l2.5 check"
136+
displayName: 'Run Tests'
137+
env:
138+
CC: gcc
139+
CXX: g++

0 commit comments

Comments
 (0)