Skip to content
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.

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

ICU-20482 Backport support for Placeholder New Era in Japanese Calendar to ICU 62 #514

Merged
merged 17 commits into from
Mar 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 68 additions & 8 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,68 @@
image: Visual Studio 2017
platform: x64
configuration: Release
build:
project: icu4c/source/allinone/allinone.sln

test_script:
- icu4c/source/allinone/icucheck.bat x64 Release
# AppVeyor configuration for CI Builds of ICU4C.

image: Visual Studio 2017
platform: x64

# Don't clone the entire repo.
clone_depth: 3

# Cache things between builds to speed things up and save bandwidth.
cache:
- c:\icu-ci-cache

environment:
global:
ICU_CI_CACHE: c:\icu-ci-cache
CYG_URL: https://cygwin.com/setup-x86_64.exe
CYG_MIRROR: http://cygwin.mirror.constant.com
CYG_PACKAGES: automake,gcc-core,gcc-g++,make,pkg-config,perl,python3
CYG_ROOT: c:\cygwin-root
CYG_CACHE: '%ICU_CI_CACHE%\cygwin64'
CYG_CACHED_SETUP: '%CYG_CACHE%\setup.exe'

matrix:
- BUILDSYSTEM: VS2017
configuration: Release
APPVEYOR_CACHE_SKIP_RESTORE: true
APPVEYOR_CACHE_SKIP_SAVE: true

- BUILDSYSTEM: cygwin64-gcc
CC: gcc
CXX: g++
APPVEYOR_SAVE_CACHE_ON_ERROR: true

for:
-
matrix:
only:
- BUILDSYSTEM: cygwin64-gcc

install:
- ps: >-
if ( !(Test-Path "${env:CYG_CACHED_SETUP}" -NewerThan (Get-Date).AddDays(-7)) )
{
Write-Host "Cached Cygwin setup does not exist or is older than 7 days, downloading from external site."
New-Item -Force -Type Directory $env:CYG_CACHE
Invoke-WebRequest $env:CYG_URL -OutFile $env:CYG_CACHED_SETUP
}
- cmd: >-
%CYG_CACHED_SETUP% --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%"

# Check that we have a working Cygwin environment before building.
before_build:
- "%CYG_ROOT%\\bin\\sh -lc 'echo Hello'"
- "%CYG_ROOT%\\bin\\sh -lc 'uname -a'"

build_script:
- '%CYG_ROOT%\\bin\\bash -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && cd icu4c/source && ./runConfigureICU Cygwin && make check"'

-
matrix:
only:
- BUILDSYSTEM: VS2017

build:
project: icu4c/source/allinone/allinone.sln

test_script:
- icu4c/source/allinone/icucheck.bat x64 Release
105 changes: 105 additions & 0 deletions .ci-builds/.azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Azure Pipelines (VSTS) configuration for CI builds for ICU.

resources:
- repo: self
lfs: true
fetchDepth: 1

jobs:
#-------------------------------------------------------------------------
- job: ICU4J_OpenJDK_Ubuntu_1604
displayName: 'J: Linux OpenJDK (Ubuntu 16.04)'
timeoutInMinutes: 20
pool:
vmImage: 'Ubuntu 16.04'
demands: ant
steps:
- script: |
echo "Building ICU4J" && cd icu4j && ant init && ant check
displayName: 'Build and Test'
env:
BUILD: ICU4J
- script: |
cat `find out/junit-results -name "*.txt" -exec grep -l FAILED {} \;`
condition: failed() # only run if the build fails.
displayName: 'List failures (if any)'
#-------------------------------------------------------------------------
- job: ICU4C_Clang_Ubuntu_1604
displayName: 'C: Linux Clang (Ubuntu 16.04)'
timeoutInMinutes: 30
pool:
vmImage: 'Ubuntu 16.04'
steps:
- script: |
cd icu4c/source && ./runConfigureICU Linux && make -j2 check
displayName: 'Build and Test'
env:
CC: clang
CXX: clang++
#-------------------------------------------------------------------------
- job: ICU4C_MSVC_x64_Release
displayName: 'C: MSVC 64-bit Release (VS 2017)'
timeoutInMinutes: 30
pool:
vmImage: 'vs2017-win2016'
demands:
- msbuild
- visualstudio
- Cmd
steps:
- task: VSBuild@1
displayName: 'Build Solution'
inputs:
solution: icu4c/source/allinone/allinone.sln
platform: x64
configuration: Release
- task: BatchScript@1
displayName: 'Run Tests (icucheck.bat)'
inputs:
filename: icu4c/source/allinone/icucheck.bat
arguments: 'x64 Release'
#-------------------------------------------------------------------------
- job: ICU4C_MSVC_x86_Release
displayName: 'C: MSVC 32-bit Release (VS 2017)'
timeoutInMinutes: 30
pool:
vmImage: 'vs2017-win2016'
demands:
- msbuild
- visualstudio
- Cmd
steps:
- task: VSBuild@1
displayName: 'Build Solution'
inputs:
solution: icu4c/source/allinone/allinone.sln
platform: Win32
configuration: Release
- task: BatchScript@1
displayName: 'Run Tests (icucheck.bat)'
inputs:
filename: icu4c/source/allinone/icucheck.bat
arguments: 'x86 Release'
#-------------------------------------------------------------------------
- job: ICU4C_MSYS2_GCC_x86_64_Release
displayName: 'C: MSYS2 GCC x86_64 Release'
timeoutInMinutes: 45
pool:
vmImage: 'vs2017-win2016'
demands:
- Cmd
steps:
- script: |
choco install -y msys2
rem refreshenv
displayName: 'Install MSYS2'
- script: |
c:\tools\msys64\usr\bin\bash.exe -lc "echo 'Hello World' && uname -a"
c:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S mingw-w64-x86_64-toolchain"
c:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S make"
exit
displayName: 'Install mingw-w64-x86_64-toolchain'
- script: |
set MSYSTEM=MINGW64
c:\tools\msys64\usr\bin\bash.exe -lc "cd $BUILD_SOURCESDIRECTORY && cd icu4c/source && ./runConfigureICU MinGW && make -j2 check"
displayName: 'Build and Test ICU4C'
104 changes: 104 additions & 0 deletions .cpyskip.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
#
# Copyright (C) 2017 and later: Unicode, Inc. and others.
# License & terms of use: http://www.unicode.org/copyright.html
#
# Copyright (c) 2005-2011 International Business Machines
# Corporation and others. All Rights Reserved.
## see NOTE below.
## Also see: http://icu-project.org/copyright-scan.html
#
# git stuff
# .git is ignored by code.
#.git/*
.gitignore
.gitattributes
.travis.yml
.appveyor.yml
.ci-builds/*
# suffix matches - start with '*'. They are turned into as RE, '.brk$'
*.brk
*.bz2
*.classpath
*.csproj
*.cvsignore
*.dat
*.DS_Store
*.doc
*.gif
*.gz
*.ico
*.icu
*.intaglio
*.jar
*.jpg
*.launch
*.nrm
*.odp
*.otf
*.pdf
*.png
*.ppt
*.prefs
*.project
*.res
*.rtf
*.sln
*.sxd
*.sxg
*.sxw
*.tri2
*.vcproj
*.vcxproj
*.vcxproj.filters
*.zip

# UnicodeData.txt does not have any header.
*/UnicodeData.txt

#
# ICU4C
#
icu4c/source/aclocal.m4
icu4c/source/config.guess
icu4c/source/config.log
icu4c/source/config.status
icu4c/source/config.sub
icu4c/source/install-sh
icu4c/source/extra/uconv/samples/*
icu4c/source/samples/layout/Sample.txt
icu4c/source/samples/ucnv/data01.txt
icu4c/source/samples/ufortune/resources/res-file-list.txt
icu4c/source/test/testdata/ConverterSelectorTestUTF8.txt
icu4c/source/test/testdata/encoded.utf16be
icu4c/source/test/testdata/idna_conf.txt
icu4c/source/test/testdata/ra.xlf
icu4c/source/test/testdata/re_tests.txt
icu4c/source/test/thaitest/space.txt
icu4c/source/tools/tzcode/asctime.c
icu4c/source/tools/tzcode/ialloc.c
icu4c/source/tools/tzcode/localtime.c
icu4c/source/tools/tzcode/private.h
icu4c/source/tools/tzcode/scheck.c
icu4c/source/tools/tzcode/tzfile.h
icu4c/source/tools/tzcode/tzselect.ksh
icu4c/source/tools/tzcode/zdump.c
icu4c/source/tools/tzcode/zic.c
#
# ICU4J
#
icu4j/eclipse-build/pdebuild/allElements.xml
icu4j/eclipse-build/pdebuild/customTargets.xml
icu4j/main/tests/core/src/com/ibm/icu/dev/data/IDNATestInput.txt
icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/confusablesWholeScript.txt
icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/UnicodeData.txt
icu4j/main/tests/core/src/com/ibm/icu/dev/test/duration/testdata/*
icu4j/perf-tests/data/conversion/*
#
# tools
#
tools/trac/IcuCodeTools/*
tools/unicodetools/*
#
# vendor
#
vendor/double-conversion/upstream/*