Skip to content

Commit

Permalink
Merge pull request #49 (Update maint/maint-67 to 67.1.0.7)
Browse files Browse the repository at this point in the history
This updates the maint/maint-67 branch to 67.1.0.7.
(This will be done as a merge commit to keep the history).
  • Loading branch information
jefgen authored Nov 12, 2020
2 parents a5ff6aa + d72b9e7 commit bd5e85d
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 9 deletions.
3 changes: 2 additions & 1 deletion build/azure-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ name: $(BuildDefinitionName)-$(date:yyMM).$(date:dd)$(rev:rrr)
variables:
codeSign: ${{ eq(variables['System.definitionId'], '1386') }}
BuildConfiguration: 'Release'
nugetPackageName: 'Microsoft.ICU.ICU4C.Runtime'

stages:
- stage: Build
Expand Down Expand Up @@ -81,7 +82,7 @@ stages:
displayName: 'Publish: symbols'
inputs:
PathtoPublish: '/tmp/icu-symbols'
ArtifactName: 'symbols-linux-x64'
ArtifactName: 'Symbols-$(nugetPackageName).linux-x64'

- job: BuildWindows
timeoutInMinutes: 30
Expand Down
13 changes: 9 additions & 4 deletions build/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,24 @@ jobs:
- script: |
cd icu/icu4c/source && make dist && ls -al dist
displayName: 'Make dist'
- script: |
mkdir /tmp/icu-tarball
cp icu/icu4c/source/dist/icu4c-src.tgz /tmp/icu-tarball
mv /tmp/icu-tarball/icu4c-src.tgz /tmp/icu-tarball/msicu-icu4c-v$(ICUVersion)-src.tgz
displayName: 'Rename source tarball'
- task: PublishBuildArtifacts@1
displayName: 'Publish Artifacts: icu4c-src.tgz'
displayName: 'Publish: Source tarball'
inputs:
PathtoPublish: 'icu/icu4c/source/dist/icu4c-src.tgz'
ArtifactName: '$(Build.BuildNumber)_ICU4C_icu4c-src_tgz'
PathtoPublish: '/tmp/icu-tarball'
ArtifactName: '$(Build.BuildNumber)_ICU4C_tarball'
- script: |
cd icu/icu4c/source/dist
timestampVar=`date +%s`
mkdir /tmp/icu-$timestampVar
tar zxf icu4c-src.tgz -C /tmp/icu-$timestampVar
cd /tmp/icu-$timestampVar/icu/source
./runConfigureICU Linux --disable-layout --disable-layoutex && make -j$(nproc) check
displayName: 'Build and Test MakeDist tarball'
displayName: 'Build and Test MakeDist using source tarball'
#-------------------------------------------------------------------------
- job: ICU4C_Clang_Ubuntu_1604_WarningsAsErrors
Expand Down
6 changes: 5 additions & 1 deletion build/scripts/Create-Nuget-Runtime.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,16 @@ if (!($localSHA)) {
if (!(Test-Path 'env:ICUVersion')) {
throw "Error: The ICU version environment variable is not set."
}
# We should already have the Nuget package name set as a environment variable.
if (!(Test-Path 'env:nugetPackageName')) {
throw "Error: The Nuget package name environment variable is not set."
}
# We should already have the Nuget version set as a environment variable.
if (!(Test-Path 'env:nugetPackageVersion')) {
throw "Error: The Nuget version environment variable is not set."
}

$packageName = 'Microsoft.ICU.ICU4C.Runtime'
$packageName = "$env:nugetPackageName"
$packageVersion = "$env:nugetPackageVersion"

if ($codesign -eq 'false') {
Expand Down
9 changes: 9 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## ICU 67.1.0.7

General changes:
- Fix PDB symbol publishing to use public server instead of internal. [#42](https://github.com/microsoft/icu/pull/42).
- CI build update to Component Governance task. [#40](https://github.com/microsoft/icu/pull/40).

Data changes:
- Microsoft data changes to revise language names. [#43](https://github.com/microsoft/icu/pull/43).

## ICU 67.1.0.6

Code/general changes:
Expand Down
4 changes: 2 additions & 2 deletions icu/icu4c/source/common/unicode/uvernum.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
* @stable ICU 4.0
*/
#ifndef U_ICU_VERSION_BUILDLEVEL_NUM
#define U_ICU_VERSION_BUILDLEVEL_NUM 6
#define U_ICU_VERSION_BUILDLEVEL_NUM 7
#endif

/** Glued version suffix for renamers
Expand Down Expand Up @@ -139,7 +139,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "67.1.0.6"
#define U_ICU_VERSION "67.1.0.7"

/**
* The current ICU library major version number as a string, for library name suffixes.
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
# in the header file "uvernum.h" whenever updated and/or changed.
#

ICU_version = 67.1.0.6
ICU_version = 67.1.0.7
ICU_upstream_hash = 125e29d54990e74845e1546851b5afa3efab06ce

0 comments on commit bd5e85d

Please sign in to comment.