Skip to content

Commit b86b7a5

Browse files
committed
ICU-23175 Consistent names for the release artifacts
1 parent 06f6ec0 commit b86b7a5

File tree

11 files changed

+44
-29
lines changed

11 files changed

+44
-29
lines changed

.github/workflows/icu4c.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,9 @@ jobs:
459459
$minorVersion = $icuVersion.Split('.')[1]
460460
# Determine the new file name based on the version
461461
if ($minorVersion -eq "0") {
462-
$newZipName = "icu4c-${majorVersion}rc-${{ matrix.win_ver }}-MSVC2022"
462+
$newZipName = "icu4c-${majorVersion}.1rc-${{ matrix.win_ver }}-MSVC2022"
463463
} else {
464-
$newZipName = "icu4c-${majorVersion}_${minorVersion}-${{ matrix.win_ver }}-MSVC2022"
464+
$newZipName = "icu4c-${majorVersion}.${minorVersion}-${{ matrix.win_ver }}-MSVC2022"
465465
}
466466
# Debugging: Print the new zip name
467467
Write-Host "New Zip Name: $newZipName"
@@ -929,21 +929,23 @@ jobs:
929929
- name: Zip
930930
run: |
931931
cd icu4c/source/icuexportdata
932-
zip -r ../../../icuexportdata_${{ inputs.gitReleaseFilename }}.zip .
932+
zip -r ../../../icu4x-exportdata_${{ inputs.gitReleaseFilename }}.zip .
933933
- name: Publish Artifact
934934
uses: actions/upload-artifact@v4
935935
with:
936936
name: icuexportdata_output
937-
path: icuexportdata_*.zip
937+
path: icu4x-exportdata_*.zip
938938
- name: Upload to release tag
939939
if: ${{ inputs.gitReleaseTag && startsWith(inputs.gitReleaseTag, 'release-') }}
940940
run: |
941-
gh release upload ${{ inputs.gitReleaseTag }} icuexportdata_*.zip --clobber
941+
zipVer=$(echo ${{ inputs.gitReleaseTag }} | sed 's/^release-//')
942+
mv icu4x-exportdata_*.zip icu4x-exportdata-${zipVer}.zip
943+
gh release upload ${{ inputs.gitReleaseTag }} icu4x-exportdata-*.zip --clobber
942944
env:
943945
GH_TOKEN: ${{ github.token }}
944946
- name: Upload to icu4x tag
945947
if: ${{ inputs.gitReleaseTag && startsWith(inputs.gitReleaseTag, 'icu4x/') }}
946948
run: |
947-
gh release upload ${{ inputs.gitReleaseTag }} icuexportdata_*.zip --clobber
949+
gh release upload ${{ inputs.gitReleaseTag }} icu4x-exportdata_*.zip --clobber
948950
env:
949951
GH_TOKEN: ${{ github.token }}

.github/workflows/release-check-sign.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ jobs:
4444
- name: Checksums and sign
4545
run: |
4646
source icu4j/releases_tools/shared.sh
47-
# Convert 76.1 to 76_1
48-
underscore_version=$(echo $artifact_version | sed 's/\./_/g')
4947
pushd ${RELEASE_FOLDER}
5048
sha512sum -b icu4c* > SHASUM512.txt
5149
md5sum -b *.jar > icu4j-${artifact_version}.md5
52-
md5sum -b icu4c-*-data-bin-*.zip > icu4c-${underscore_version}-binary.md5
53-
md5sum -b icu4c-*-src.* > icu4c-${underscore_version}-sources.md5
50+
md5sum -b icu4c-*-data-bin-*.zip > icu4c-${artifact_version}-binary.md5
51+
md5sum -b icu4c-*-src.* > icu4c-${artifact_version}-sources.md5
5452
find . -type f -name 'icu4c*' -exec gpg --no-tty --batch --pinentry-mode loopback --passphrase=$MAVEN_GPG_PASSPHRASE -a --output {}.asc --detach-sig {} \;
5553
gpg --no-tty --batch --pinentry-mode loopback --passphrase=$MAVEN_GPG_PASSPHRASE -a --output SHASUM512.txt.asc --detach-sig SHASUM512.txt
5654
popd

.github/workflows/release-icu4c-fedora.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,8 @@ jobs:
6464
source /etc/os-release
6565
# Get the ICU version in artifact_version
6666
source icu4j/releases_tools/shared.sh
67-
# Convert 76.1 to 76_1
68-
underscore_version=$(echo $artifact_version | sed 's/\./_/g')
6967
pushd ${RELEASE_FOLDER}
70-
tar -czf icu4c-${underscore_version}-Fedora_Linux${VERSION_ID}-x64.tgz icu
68+
tar -czf icu4c-${artifact_version}-Fedora_Linux${VERSION_ID}-x64.tgz icu
7169
rm -fr icu
7270
popd
7371

.github/workflows/release-icu4c-ubuntu.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ jobs:
5858
source /etc/os-release
5959
# Get the ICU version in artifact_version
6060
source icu4j/releases_tools/shared.sh
61-
# Convert 77.1 to 77_1
62-
underscore_version=$(echo $artifact_version | sed 's/\./_/g')
6361
pushd ${RELEASE_FOLDER}
64-
tar -czf icu4c-${underscore_version}-Ubuntu${VERSION_ID}-x64.tgz icu
62+
tar -czf icu4c-${artifact_version}-Ubuntu${VERSION_ID}-x64.tgz icu
6563
rm -fr icu
6664
popd
6765
mv icu4c/source/dist/icu4c-77_1-d* ${RELEASE_FOLDER}

docs/processes/release/tasks/docs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ javadoc files. Create icu4c-X_X_X-docs.zip
326326
3. The generated API docs are in <path>/icu4c/source/doc/html/<br>
327327
`cd <path>/icu4c/source/doc/html/`
328328
4. Create a zip file, e.g.,<br>
329-
`tar cvfz /tmp/icu4c72rc.tar.gz * # Note: label the file apropriately for the release.
329+
`tar cvfz /tmp/icu4c78.1rc.tar.gz * # Note: label the file apropriately for the release.
330330
5. Edit [README.md in icu-docs](https://github.com/unicode-org/icu-docs/blob/main/README.md).
331331
6. Update the table under "API docs" at the top of README.md with the new version in column "C" in row "Dev" for the release candidate or "Released" for the final release.
332332
7. Add the updated README.md to the pull request with the new API documentation.
@@ -346,8 +346,8 @@ javadoc files. Create icu4c-X_X_X-docs.zip
346346

347347
d. Be sure that you are in the right directory. Then, remove all the files
348348
in this directory, e.g., `rm -rf *`. (Remember "git restore" is a good friend!)
349-
350-
e. Unzip the tar file from above, replacing all documentation. Ex: `tar xvfz /tmp/icu4c72rc.tar.gz`
349+
350+
e. Unzip the tar file from above, replacing all documentation. Ex: `tar xvfz /tmp/icu4c-78.1rc.tar.gz`
351351

352352
e. Remove the zip file if it's in the folder.
353353

docs/processes/release/tasks/publish/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Use the GitHub GUI to create both the "release" and the "tag" at the same time:
102102

103103
<https://github.com/unicode-org/icu/releases/new>
104104

105-
1. Fill in the tag name, such as `release-63-rc` or `release-63-1`, and make the
105+
1. Fill in the tag name, such as `release-63-1rc` or `release-63-1`, and make the
106106
target the "maint/maint-xx" branch (such as `maint/maint-63`).
107107
1. Set the title to `ICU 63 RC` or `ICU 63.1`.
108108
1. Fill in the description using the
@@ -320,9 +320,9 @@ That new flow overlaps with _"Using the output from the build bots"_ below.
320320
* Navigate into the folder with the same name.
321321
* Check and verify the names of the zip file are appropriate:
322322
* Ex: The x64 zip for version 76.1 should be named
323-
"icu4c-76_1-Win64-MSVC2022.zip"
323+
"icu4c-76.1-Win64-MSVC2022.zip"
324324
* Ex: The x86 zip for version 76.1 should be named
325-
"icu4c-76_1-Win32-MSVC2022.zip"
325+
"icu4c-76.1-Win32-MSVC2022.zip"
326326
* Note: For RC releases the name looked like this:
327327
"icu4c-76rc-Win64-MSVC2022"
328328
* ~~AIX Bin:~~ (AIX is broken and ignored for now.)

docs/processes/release/tasks/publish/release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Here you should use the release tag.
6262
* The icu4c data files (`icu4c-{icuver}-data.zip`,
6363
`icu4c-{icuver}-data-bin-b.zip`, `icu4c-{icuver}-data-bin-l.zip`)
6464
* The icu4c source archives (`icu4c-{icuver}-src.tgz` and `icu4c-{icuver}-src.zip`)
65-
* The ICU4C documentation (`icu4c-76_1-docs.zip`) \
65+
* The ICU4C documentation (`icu4c-{icuver}-docs.zip`) \
6666
**WARNING:** this is also the one to be published (unpacked) for web access
6767

6868
1. **Release - ICU4J publish to Maven Central** (`release-icu4j-maven.yml`) \

docs/processes/release/tasks/versions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ The command requires a version number string that follows the typical Java / Mav
215215
5. Update the following variables in `icu4j/releases_tools/shared.sh`
216216
217217
* `artifact_version` - The version used in the Maven `pom.xml` files. You can alternatively produce this value by running `mvn help:evaluate -Dexpression=project.version -q -DforceStdout`.
218-
* `github_rel_version` - The version used in the name of the GitHub downloadable artifacts. For example "73_2" or "74rc".
218+
* `github_rel_version` - The version used in the name of the GitHub downloadable artifacts. For example "78.2" or "78.1rc".
219219
* `api_report_version` - The major version of the new version. Change during RC BRS.
220220
* `api_report_prev_version` - The major version of the previous version. Change during RC BRS.
221221
@@ -282,7 +282,7 @@ For updating ICU version numbers, follow the steps below.
282282
releases, use <2-digit major version> + "m" + <milestone number>, e.g.
283283
"55m1". For release candidate, use <2-digit major version> + "rc", e.g.
284284
54rc. For official releases, use full version numbers using under bar as the
285-
separator, e.g. "54_1", "54_1_1".
285+
separator, e.g. "54.1", "54.1.1".
286286
* api.doc.version: The version displayed in API reference doc - use full
287287
version number such as "60.1" for official and RC releases, "60 Milestone 1" for
288288
milestone 1.

icu4j/releases_tools/shared.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export MAVEN_ARGS='--no-transfer-progress'
66

77
# Version update!
88
export artifact_version='78.0.1-SNAPSHOT'
9-
export github_rel_version='78_0_1'
9+
export github_rel_version='78.0.1'
1010
export api_report_version='78'
1111
export api_report_prev_version='77'
1212
export out_dir=target

tools/currency/.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,15 @@
1414
<natures>
1515
<nature>org.eclipse.jdt.core.javanature</nature>
1616
</natures>
17+
<filteredResources>
18+
<filter>
19+
<id>1754600590952</id>
20+
<name></name>
21+
<type>30</type>
22+
<matcher>
23+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
25+
</matcher>
26+
</filter>
27+
</filteredResources>
1728
</projectDescription>

0 commit comments

Comments
 (0)