diff options
| author | Colin Cross <ccross@android.com> | 2022-04-04 18:21:20 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2022-04-04 18:21:20 -0700 |
| commit | 19de5bf419ade482627bce9945cd6795bb600722 (patch) | |
| tree | 3f55406a7967ec271471e847848efd31eefd01ac | |
| parent | d6c6ab38b72ac1a0fcef43dd680ea47c618bd951 (diff) | |
| download | jdk17-19de5bf419ade482627bce9945cd6795bb600722.tar.gz | |
Remove staging commit from update script
The extra staging commit was used for goma and is no longer
necessary.
Test: update prebuilts
Change-Id: I5172cc5d17ba70bc78cdf2485b39faec84d71535
| -rwxr-xr-x | update.sh | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -40,13 +40,8 @@ cp linux-x86/bin/*_remote_toolchain_inputs staging/linux-x86/bin version=$(staging/linux-x86/bin/java -version 2>&1 | grep "OpenJDK Runtime Environment" | sed -e 's/.*(\(.*\))/\1/') -# Commit to staging -git add staging -git commit -m "Add JDK ${version} to staging - -Test: none" - -git rm -rf linux-x86 darwin-x86 manifest.xml -git mv staging/* . +rm -rf linux-x86 darwin-x86 manifest.xml +mv staging/* . rmdir staging -git commit -m "Switch to JDK $version" --edit +git add linux-x86 darwin-x86 manifest.xml +git commit -m "Update to JDK $version" --edit |