diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-08-11 15:05:34 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-08-11 15:05:34 +0000 |
commit | eaa539578bd908b7e7e065c10cebe262b7bd251d (patch) | |
tree | edea90b3562464ad7971b06b5bad15d9f5b05259 | |
parent | cb1af1cc052381007774d4275655591aafd7cd90 (diff) | |
parent | 6bcdd5f02d092d32c3c5a8b26192669bd95507d2 (diff) | |
download | support-snap-temp-L80200000731021888.tar.gz |
Merge "Merge cherrypicks of [1395954, 1395955, 1395956] into androidx-activity-release" into androidx-activity-releasesnap-temp-L80200000731021888snap-temp-L76800000674718731snap-temp-L38600000674275139
-rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt | 12 | ||||
-rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/gitclient/GitClient.kt | 20 | ||||
-rwxr-xr-x | busytown/androidx_host_tests.sh | 13 | ||||
-rwxr-xr-x | busytown/androidx_max_dep_versions.sh | 13 | ||||
-rwxr-xr-x | busytown/androidx_snapshot.sh | 13 | ||||
-rwxr-xr-x | busytown/androidx_test_changed_apks.sh | 13 | ||||
-rwxr-xr-x | busytown/androidx_test_dependent_apks.sh | 13 |
7 files changed, 88 insertions, 9 deletions
diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt index e6da539d2d7..47f9f64b4b4 100644 --- a/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt +++ b/buildSrc/src/main/kotlin/androidx/build/CreateLibraryBuildInfoFileTask.kt @@ -68,15 +68,19 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() { return library?.mavenGroup?.requireSameVersion ?: false } - private fun getCommitShaAtHead(): String { - val commitList: List<Commit> = GitClientImpl(project.rootDir).getGitLog( + /* For androidx release notes, the most common use case is to track and publish the last sha + * of the build that is released. Thus, we use frameworks/support to get the sha + */ + private fun getFrameworksSupportCommitShaAtHead(): String { + val supportRoot = getSupportRoot(project) + val commitList: List<Commit> = GitClientImpl(supportRoot, logger).getGitLog( GitCommitRange( fromExclusive = "", untilInclusive = "HEAD", n = 1 ), keepMerges = true, - fullProjectDir = project.projectDir + fullProjectDir = supportRoot ) return commitList.first().sha } @@ -108,7 +112,7 @@ open class CreateLibraryBuildInfoFileTask : DefaultTask() { libraryBuildInfoFile.groupId = project.group.toString() libraryBuildInfoFile.version = project.version.toString() libraryBuildInfoFile.path = getProjectSpecificDirectory() - libraryBuildInfoFile.sha = getCommitShaAtHead() + libraryBuildInfoFile.sha = getFrameworksSupportCommitShaAtHead() libraryBuildInfoFile.groupIdRequiresSameVersion = requiresSameVersion() val libraryDependencies = ArrayList<LibraryBuildInfoFile.Dependency>() val checks = ArrayList<LibraryBuildInfoFile.Check>() diff --git a/buildSrc/src/main/kotlin/androidx/build/gitclient/GitClient.kt b/buildSrc/src/main/kotlin/androidx/build/gitclient/GitClient.kt index 356a32031ea..02572263711 100644 --- a/buildSrc/src/main/kotlin/androidx/build/gitclient/GitClient.kt +++ b/buildSrc/src/main/kotlin/androidx/build/gitclient/GitClient.kt @@ -151,6 +151,7 @@ class GitClientImpl( val bodyDelimiter: String = "_Body:" val localProjectDir: String = fullProjectDir.toString() .removePrefix(gitRoot.toString()) + val relativeProjectDir: String = fullProjectDir.relativeTo(workingDir).toString() var gitLogOptions: String = "--pretty=format:$commitStartDelimiter%n" + @@ -168,10 +169,10 @@ class GitClientImpl( if (gitCommitRange.fromExclusive != "") { gitLogCmd = "$GIT_LOG_CMD_PREFIX $gitLogOptions " + "${gitCommitRange.fromExclusive}..${gitCommitRange.untilInclusive}" + - " -- $fullProjectDir" + " -- ./$relativeProjectDir" } else { gitLogCmd = "$GIT_LOG_CMD_PREFIX $gitLogOptions ${gitCommitRange.untilInclusive} -n " + - "${gitCommitRange.n} -- $fullProjectDir" + "${gitCommitRange.n} -- ./$relativeProjectDir" } val gitLogString: String = commandRunner.execute(gitLogCmd) return parseCommitLogString( @@ -198,12 +199,21 @@ class GitClientImpl( .start() proc.waitFor(1, TimeUnit.MINUTES) - val response = proc + val stdout = proc .inputStream .bufferedReader() .readText() - logger?.info("Response: $response") - return response + val stderr = proc + .errorStream + .bufferedReader() + .readText() + val message = stdout + stderr + if (stderr != "") { + logger?.error("Response: $message") + } else { + logger?.info("Response: $message") + } + return stdout } override fun executeAndParse(command: String): List<String> { val response = execute(command) diff --git a/busytown/androidx_host_tests.sh b/busytown/androidx_host_tests.sh new file mode 100755 index 00000000000..84154e6eac6 --- /dev/null +++ b/busytown/androidx_host_tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +SCRIPT_DIR="$(cd $(dirname $0) && pwd)" +# TODO(b/141549086): move everything below into a common script once this script (androidx_host_tests.sh) is under presubmit testing +if [ "$DIST_DIR" == "" ]; then + DIST_DIR="$SCRIPT_DIR/../../../out/dist" +fi +mkdir -p "$DIST_DIR" +cd "$SCRIPT_DIR/../../.." + +OUT_DIR=out DIST_DIR="$DIST_DIR" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/gradlew -p frameworks/support --no-daemon test jacocoTestReport zipEcFiles --info +OUT_DIR=out/ui DIST_DIR="$DIST_DIR/ui" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/ui/gradlew -p frameworks/support/ui --no-daemon test jacocoTestReport zipEcFiles --info diff --git a/busytown/androidx_max_dep_versions.sh b/busytown/androidx_max_dep_versions.sh new file mode 100755 index 00000000000..2f5809964e0 --- /dev/null +++ b/busytown/androidx_max_dep_versions.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +SCRIPT_DIR="$(cd $(dirname $0) && pwd)" +# TODO(b/141549086): move everything below into a common script once this script (androidx_max_dep_versions.sh) is under presubmit testing +if [ "$DIST_DIR" == "" ]; then + DIST_DIR="$SCRIPT_DIR/../../../out/dist" +fi +mkdir -p "$DIST_DIR" +cd "$SCRIPT_DIR/../../.." + +OUT_DIR=out DIST_DIR="$DIST_DIR" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/gradlew -p frameworks/support --no-daemon buildOnServer -PuseMaxDepVersions +OUT_DIR=out/ui DIST_DIR="$DIST_DIR/ui" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/ui/gradlew -p frameworks/support/ui --no-daemon buildOnServer -PuseMaxDepVersions diff --git a/busytown/androidx_snapshot.sh b/busytown/androidx_snapshot.sh new file mode 100755 index 00000000000..d7ab793ed95 --- /dev/null +++ b/busytown/androidx_snapshot.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +SCRIPT_DIR="$(cd $(dirname $0) && pwd)" +# TODO(b/141549086): move everything below into a common script once this script (androidx_host_tests_max_dep_versions.sh) is under presubmit testing +if [ "$DIST_DIR" == "" ]; then + DIST_DIR="$SCRIPT_DIR/../../../out/dist" +fi +mkdir -p "$DIST_DIR" +cd "$SCRIPT_DIR/../../.." + +SNAPSHOT=true OUT_DIR=out DIST_DIR="$DIST_DIR" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/gradlew -p frameworks/support --no-daemon createArchive +SNAPSHOT=true OUT_DIR=out/ui DIST_DIR="$DIST_DIR/ui" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/ui/gradlew -p frameworks/support/ui --no-daemon createArchive diff --git a/busytown/androidx_test_changed_apks.sh b/busytown/androidx_test_changed_apks.sh new file mode 100755 index 00000000000..71c55f649a5 --- /dev/null +++ b/busytown/androidx_test_changed_apks.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +SCRIPT_DIR="$(cd $(dirname $0) && pwd)" +# TODO(b/141549086): move everything below into a common script once this script (androidx_test_changed_apks.sh) is under presubmit testing +if [ "$DIST_DIR" == "" ]; then + DIST_DIR="$SCRIPT_DIR/../../../out/dist" +fi +mkdir -p "$DIST_DIR" +cd "$SCRIPT_DIR/../../.." + +OUT_DIR=out DIST_DIR="$DIST_DIR" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/gradlew -p frameworks/support --no-daemon buildTestApks -Pandroidx.enableAffectedModuleDetection -Pandroidx.changedProjects +OUT_DIR=out/ui DIST_DIR="$DIST_DIR/ui" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/ui/gradlew -p frameworks/support/ui --no-daemon buildTestApks -Pandroidx.enableAffectedModuleDetection -Pandroidx.changedProjects diff --git a/busytown/androidx_test_dependent_apks.sh b/busytown/androidx_test_dependent_apks.sh new file mode 100755 index 00000000000..ba3c49ee2fd --- /dev/null +++ b/busytown/androidx_test_dependent_apks.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +SCRIPT_DIR="$(cd $(dirname $0) && pwd)" +# TODO(b/141549086): move everything below into a common script once this script (androidx_test_dependent_apks.sh) is under presubmit testing +if [ "$DIST_DIR" == "" ]; then + DIST_DIR="$SCRIPT_DIR/../../../out/dist" +fi +mkdir -p "$DIST_DIR" +cd "$SCRIPT_DIR/../../.." + +OUT_DIR=out DIST_DIR="$DIST_DIR" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/gradlew -p frameworks/support --no-daemon buildTestApks -Pandroidx.enableAffectedModuleDetection -Pandroidx.dependentProjects +OUT_DIR=out/ui DIST_DIR="$DIST_DIR/ui" ANDROID_HOME=`pwd`/prebuilts/fullsdk-linux frameworks/support/ui/gradlew -p frameworks/support/ui --no-daemon buildTestApks -Pandroidx.enableAffectedModuleDetection -Pandroidx.dependentProjects' |