Lines Matching +full:test +full:- +full:shell
4 https://github.com/unicode-org/icu/releases.
10 * See http://site.icu-project.org/repository
11 …* [git-lts](https://git-lfs.github.com/) has to be installed to pull binaries correctly from the g…
12 …* [git-filter-repo](https://github.com/newren/git-filter-repo) for rewriting the `Change-Id` later.
13 2. Generate a github read-access token and setup a local ~/.m2/setting.xml
17 * http://go/repo-init/aosp-main-with-phones
21 * We **rebase** Android-specific patches on the `icu-staging` branch. Then we merge into
24 * We use the **`aosp/upstream-release-cldr** as the mirror of the upstream release branch.
30 ```shell
32 lunch aosp_cf_x86_64_phone-trunk_staging-userdebug
35 The build should succeed. Otherwise, your local repo may be broken. Please consider to re-sync.
37 * If you re-run the generation scripts and it causes new changes, some patches are missing
40 ```shell
43 system/timezone/update-tzdata.py
54 ```shell
60 export UPSTREAM_CLDR_GIT=/media/user/disk/icu-git/cldr
61 export UPSTREAM_ICU_GIT=/media/user/disk/icu-git/icu
64 2. Copy the CLDR sources into the `upstream-release-cldr` branch
67 ```shell
68 export CLDR_UPSTREAM_BRANCH=release-${CLDR_VERSION}
71 git fetch aosp upstream-release-cldr
72 git branch ${CLDR_UPSTREAM_BRANCH} --track aosp/upstream-release-cldr
75 git clone https://github.com/unicode-org/cldr.git ${UPSTREAM_CLDR_GIT}
77 git --git-dir=${UPSTREAM_CLDR_GIT}/.git --work-tree=${UPSTREAM_CLDR_GIT} fetch
78 …git --git-dir=${UPSTREAM_CLDR_GIT}/.git --work-tree=${UPSTREAM_CLDR_GIT} checkout ${CLDR_UPSTREAM_…
79 rm -rf *
80 cp -r ${UPSTREAM_CLDR_GIT}/* .
81 git clean -dfX # Remove ignored files
82 git add -A
83 git commit -F- <<EOF
87 Test: n/a
89 # Upload this CL to upstream-release-cldr branch
90 repo upload --cbr .
94 ```shell
95 export CLDR_BRANCH=cldr${CLDR_VERSION}-main
96 git branch ${CLDR_BRANCH} --track aosp/main
98 git merge ${CLDR_UPSTREAM_BRANCH} -m "
99 Merge CLDR ${CLDR_VERSION} in upstream-release-cldr into aosp/main
102 Test: external/icu/tools/updatecldrdata.py
106 2c. Resolve any merge conflicts with the Android-specific patches.
108 ```shell
109 git merge --continue
113 ```shell
114 repo upload --cbr .
118 ```shell
120 export ICU_BRANCH=icu-staging
121 export UPSTREAM_RELEASE_TAG=release-${ICU_VERSION}-${ICU_MINOR_VERSION}
123 git branch ${ICU_BRANCH} --track aosp/${ICU_BRANCH}
126 git merge --no-ff aosp/main -m
131 Test: n/a
134 …test -d ${UPSTREAM_ICU_GIT} || git clone https://github.com/unicode-org/icu.git ${UPSTREAM_ICU_GIT}
136 git --git-dir=${UPSTREAM_ICU_GIT}/.git --work-tree=${UPSTREAM_ICU_GIT} fetch
137 …git --git-dir=${UPSTREAM_ICU_GIT}/.git --work-tree=${UPSTREAM_ICU_GIT} checkout ${UPSTREAM_RELEASE…
138 …ind icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar…
139 …find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|.gitignore\|AndroidTest.xml\)" -delete
140 cp -r ${UPSTREAM_ICU_GIT}/icu4j .
141 cp -r ${UPSTREAM_ICU_GIT}/icu4c .
142 …git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore # Android has extra .gitignores. Use our ve…
143 rm -r tools/cldr
144 cp -r ${UPSTREAM_ICU_GIT}/tools/cldr tools/cldr
146 git add -A
147 git commit -F- <<EOF
151 …ind icu4j/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|adjust_icudt_path.mk\|liblayout-jarjar…
152 …find icu4c/ -type f,d ! -regex ".*/\(Android.mk\|Android.bp\|.gitignore\|AndroidTest.xml\)" -delete
153 cp -r \${UPSTREAM_ICU_GIT}/icu4j .
154 cp -r \${UPSTREAM_ICU_GIT}/icu4c .
155 git checkout HEAD -- icu4c/.gitignore icu4j/.gitignore
156 rm -r tools/cldr
157 cp -r \${UPSTREAM_ICU_GIT}/tools/cldr tools/cldr
161 4. Apply Android-specific patches into `external/icu`
163 …4a. Cherry-pick the patches from the last staging branch. For example using the following query fo…
164 …* https://android-review.git.corp.google.com/q/%22Android+patch%22+branch:icu-staging+status:merged
165 * The cherry-pick command is
166 ```shell
167 git cherry-pick <first_patch_in_the_chain>~1..<last_patch_in_the_chain>
169 4b. Cherry-pick the patches since the ICU upgrade
171 …h%2522+project:platform/external/icu+status:merged+-owner:automerger+-owner:android-build-coastgua…
172 4c. Reset `Change-Id` in the cherry-picked CLs
173 * ```shell
174 …THE_COPY_COMMIT=$(git log --pretty=format:'%h' -n 1 --grep "Copy ICU ${UPSTREAM_RELEASE_TAG} into …
175 git filter-branch -f --msg-filter 'sed "s/Change-Id: .*//g"' ${THE_COPY_COMMIT}..HEAD
176 git rebase -i ${THE_COPY_COMMIT} # It should open vim
179 # It triggers the git-hook to generate a Change-Id.
180 # TODO: Find a better way to generate Change-Id
185 ```shell
189 git add -A
190 git commit -F- <<EOF
196 Test: n/a
201 ```shell
203 git add -A
204 git commit -F- <<EOF
210 Test: n/a
216 ```shell
218 git add -A
219 git commit -F- <<EOF
222 Test: ./tools/srcgen/generate_allowlisted_public_api.sh
228 ```shell
231 git add -A
232 git commit -F- <<EOF
238 Test: n/a
243 ```shell
244 find android_icu4j/ -name *.orig -delete
246 git commit -amend
249 git add -A && git commit -F- <<EOF
252 Test: n/a
256 5e. Re-genereate libandroidicu/ sources
257 ```shell
259 git add -A && git commit -F- <<EOF
265 Test: n/a
271 ```shell
274 git add -A && git commit -a -F- <<EOF
280 Test: n/a
285 ```shell
289 ```shell
292 git add -A && git commit -F- <<EOF
303 ```shell
306 ./update-tzdata.py
307 git add -A
308 git commit -F- <<EOF
312 system/timezone/update-tzdata.py
318 Test: n/a
323 git add -A
324 git commit -F- <<EOF
325 Regenerate tz-related data files
328 system/timezone/update-tzdata.py
331 Test: n/a
338 android-libcore-team@ how to deal with the updates, because they may need to cherry-pick
347 ```shell
350 git commit -a -F- <<EOF
357 Test: atest FrameworksCoreTests:android.text.format
360 6. Build and run test
364 …s CtsLibcoreOjTestCases CtsBionicTestCases CtsTextTestCases minikin_tests -- --abi x86_64 # the pr…
366 6c. [No longer needed] Run the host-side test by
367 * ICU4J host-side test `ant check`
368 * ICU4C host-side test `make CINTLTST_OPTS=-w INTLTEST_OPTS=-w check`
372 * To verify the test change in ART MTS, run `m mts && mts-tradefed run mts-art` on Android S.
373 …* To verify the test change on LUCI bot, run `art/tools/run-libcore-tests.sh --mode=host`, because…
375 …views from `aosp/icu${ICU_VERSION}` in `external/icu` and `aosp/upstream-release-cldr` in `externa…
376 ```shell
377 repo upload --cbr -o nokeycheck -o uploadvalidator~skip --no-verify .
380 ```shell
382 repo start icu${ICU_VERSION}-main .
383 git merge --no-ff icu${ICU_VERSION} -m "
387 …Test: atest CtsIcu4cTestCases CtsIcuTestCases CtsLibcoreTestCases CtsLibcoreOjTestCases CtsBionicT…
392 10a. `repo upload --cbr -o uploadvalidator~skip --no-verify .`
400 ```shell
401 rm tools/srcgen/allowlisted-public-api.txt
404 m update-api droid
406 git commit -a -F- <<EOF
409 According to the upstream API coverage report external/icu/icu4j/coverage-exclusion.txt,
413 Test: atest CtsIcuTestCases
416 11. Send email android-libcore@ and icu-team@ to announce this.
425 https://googleplex-android.googlesource.com/platform/external/icu/+/sc-dev/README.version
428 - Contains bug fixes / build changes with a small set of API methods added.
429 - Unicode stays at version 14, and no new version has been published yet.