Skip to content

Commit bd5e85d

Browse files
authored
Merge pull request #49 (Update maint/maint-67 to 67.1.0.7)
This updates the maint/maint-67 branch to 67.1.0.7. (This will be done as a merge commit to keep the history).
2 parents a5ff6aa + d72b9e7 commit bd5e85d

File tree

6 files changed

+28
-9
lines changed

6 files changed

+28
-9
lines changed

build/azure-nuget.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ name: $(BuildDefinitionName)-$(date:yyMM).$(date:dd)$(rev:rrr)
1010
variables:
1111
codeSign: ${{ eq(variables['System.definitionId'], '1386') }}
1212
BuildConfiguration: 'Release'
13+
nugetPackageName: 'Microsoft.ICU.ICU4C.Runtime'
1314

1415
stages:
1516
- stage: Build
@@ -81,7 +82,7 @@ stages:
8182
displayName: 'Publish: symbols'
8283
inputs:
8384
PathtoPublish: '/tmp/icu-symbols'
84-
ArtifactName: 'symbols-linux-x64'
85+
ArtifactName: 'Symbols-$(nugetPackageName).linux-x64'
8586

8687
- job: BuildWindows
8788
timeoutInMinutes: 30

build/azure-pipelines.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,24 @@ jobs:
2626
- script: |
2727
cd icu/icu4c/source && make dist && ls -al dist
2828
displayName: 'Make dist'
29+
- script: |
30+
mkdir /tmp/icu-tarball
31+
cp icu/icu4c/source/dist/icu4c-src.tgz /tmp/icu-tarball
32+
mv /tmp/icu-tarball/icu4c-src.tgz /tmp/icu-tarball/msicu-icu4c-v$(ICUVersion)-src.tgz
33+
displayName: 'Rename source tarball'
2934
- task: PublishBuildArtifacts@1
30-
displayName: 'Publish Artifacts: icu4c-src.tgz'
35+
displayName: 'Publish: Source tarball'
3136
inputs:
32-
PathtoPublish: 'icu/icu4c/source/dist/icu4c-src.tgz'
33-
ArtifactName: '$(Build.BuildNumber)_ICU4C_icu4c-src_tgz'
37+
PathtoPublish: '/tmp/icu-tarball'
38+
ArtifactName: '$(Build.BuildNumber)_ICU4C_tarball'
3439
- script: |
3540
cd icu/icu4c/source/dist
3641
timestampVar=`date +%s`
3742
mkdir /tmp/icu-$timestampVar
3843
tar zxf icu4c-src.tgz -C /tmp/icu-$timestampVar
3944
cd /tmp/icu-$timestampVar/icu/source
4045
./runConfigureICU Linux --disable-layout --disable-layoutex && make -j$(nproc) check
41-
displayName: 'Build and Test MakeDist tarball'
46+
displayName: 'Build and Test MakeDist using source tarball'
4247
4348
#-------------------------------------------------------------------------
4449
- job: ICU4C_Clang_Ubuntu_1604_WarningsAsErrors

build/scripts/Create-Nuget-Runtime.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@ if (!($localSHA)) {
5858
if (!(Test-Path 'env:ICUVersion')) {
5959
throw "Error: The ICU version environment variable is not set."
6060
}
61+
# We should already have the Nuget package name set as a environment variable.
62+
if (!(Test-Path 'env:nugetPackageName')) {
63+
throw "Error: The Nuget package name environment variable is not set."
64+
}
6165
# We should already have the Nuget version set as a environment variable.
6266
if (!(Test-Path 'env:nugetPackageVersion')) {
6367
throw "Error: The Nuget version environment variable is not set."
6468
}
6569

66-
$packageName = 'Microsoft.ICU.ICU4C.Runtime'
70+
$packageName = "$env:nugetPackageName"
6771
$packageVersion = "$env:nugetPackageVersion"
6872

6973
if ($codesign -eq 'false') {

changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## ICU 67.1.0.7
4+
5+
General changes:
6+
- Fix PDB symbol publishing to use public server instead of internal. [#42](https://github.com/microsoft/icu/pull/42).
7+
- CI build update to Component Governance task. [#40](https://github.com/microsoft/icu/pull/40).
8+
9+
Data changes:
10+
- Microsoft data changes to revise language names. [#43](https://github.com/microsoft/icu/pull/43).
11+
312
## ICU 67.1.0.6
413

514
Code/general changes:

icu/icu4c/source/common/unicode/uvernum.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
* @stable ICU 4.0
8080
*/
8181
#ifndef U_ICU_VERSION_BUILDLEVEL_NUM
82-
#define U_ICU_VERSION_BUILDLEVEL_NUM 6
82+
#define U_ICU_VERSION_BUILDLEVEL_NUM 7
8383
#endif
8484

8585
/** Glued version suffix for renamers
@@ -139,7 +139,7 @@
139139
* This value will change in the subsequent releases of ICU
140140
* @stable ICU 2.4
141141
*/
142-
#define U_ICU_VERSION "67.1.0.6"
142+
#define U_ICU_VERSION "67.1.0.7"
143143

144144
/**
145145
* The current ICU library major version number as a string, for library name suffixes.

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
# in the header file "uvernum.h" whenever updated and/or changed.
3636
#
3737

38-
ICU_version = 67.1.0.6
38+
ICU_version = 67.1.0.7
3939
ICU_upstream_hash = 125e29d54990e74845e1546851b5afa3efab06ce

0 commit comments

Comments
 (0)