Cleanup build scripts #858

ajkannan · 2016-04-05T23:42:23Z

The following changes were made:

Do not deploy artifacts when SITE_VERSION is empty (due to maven plugin failure when extracting the version)
Fixes Update order of after_success tasks for deployment #841 by reordering tasks in after_success.sh and also skipping ITs in deployment
Makes the max depth for README/pom.xml version updates 2 to accommodate modules under gcloud-java-contrib
Skips CI for gh-pages push

coveralls · 2016-04-05T23:48:30Z

Changes Unknown when pulling bd14646 on ajkannan:cleanup-build-scripts into * on GoogleCloudPlatform:master*.

ajkannan · 2016-04-05T23:56:47Z

I made a note in #819 to note that auto-version updating occurs, and that any new READMEs should be written to conform to avoid bugs/not being updated OR the script should be updated.

coveralls · 2016-04-06T00:00:18Z

Changes Unknown when pulling 7742d0e on ajkannan:cleanup-build-scripts into * on GoogleCloudPlatform:master*.

ajkannan · 2016-04-06T03:10:40Z

Added message before exit and made find in update_docs_version.sh more specific. There is an -o option, but that can only be used with "tests" on a filename, not options that specify how find generates a list of filenames (e.g. -maxdepth). As a result, I changed the find statement to be a bit different than discussed.

coveralls · 2016-04-06T03:13:22Z

Changes Unknown when pulling de646c6 on ajkannan:cleanup-build-scripts into * on GoogleCloudPlatform:master*.

coveralls · 2016-04-06T03:15:35Z

Changes Unknown when pulling de646c6 on ajkannan:cleanup-build-scripts into * on GoogleCloudPlatform:master*.

RELEASING.md

@@ -10,6 +10,8 @@ This script takes an optional argument denoting the new version.  By default, if
 2. Create a PR to update the pom.xml version.  If releasing a new client library, this PR should also update javadoc grouping in the base directory's [pom.xml](./pom.xml).
 PRs that don't release new modules should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225).  PRs that do release a new module should also add the appropriate packages to the javadoc groups "SPI" and "Test helpers", as shown in [#802](https://github.com/GoogleCloudPlatform/gcloud-java/pull/802) for `gcloud-java-dns`. After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.

+  Important: Do not merge in any non-release-related pull requests between the start of step 2 and the end of step 6.  Between these steps, the project version is a non-snapshot version, so any commits to the master branch will cause the artifacts to be redeployed and the website to be regenerated via Travis.


coveralls · 2016-04-06T16:21:06Z

Changes Unknown when pulling 5204fdc on ajkannan:cleanup-build-scripts into * on GoogleCloudPlatform:master*.

RELEASING.md


-3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number.  If the deployment didn't succeed because of a flaky test, rerun the build.
+3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository.  Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR.  Be sure that you are not opening the "Pull Request" build logs.  When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed.  Search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number.  In rare cases (when the Maven plugin that determines the version of the repository fails), the artifacts may not be deployed even if the version in the pom.xml files don't contain `SNAPSHOT`.  If the artifacts weren't deployed due to invalid version parsing or a flaky test, rerun the build.


ajkannan · 2016-04-06T22:20:04Z

Fixed the regex, fixed the RELEASING doc, and added check for whether the artifact was deployed before attempting to deploy. The last item is so that if the deployment succeeds, but for some reason Travis times out or the website deployment errors, we will be able to rerun the script without failing due to the deployment failing (from redeployment).

utilities/after_success.sh

-            # Deploy site if not a SNAPSHOT
+            # Deploy Maven artifacts (if they don't exist yet) and update artifact version in READMEs.
+            ARTIFACT_EXISTS=$(mvn wagon:exist -Dwagon.url=https://oss.sonatype.org/content/repositories/releases/com/google/gcloud/gcloud-java/$SITE_VERSION)
+            if [[ "$ARTIFACT_EXISTS" == *"does not exists."* -a "$ARTIFACT_EXISTS" != "" ]]; then


ajkannan · 2016-04-08T00:36:46Z

Added a commit that changes the if statement to decide whether or not to deploy. Ready for another look.

coveralls · 2016-04-08T00:41:47Z

Coverage decreased (-0.0009%) to 85.29% when pulling 9a1ffbd on ajkannan:cleanup-build-scripts into 29b1ea5 on GoogleCloudPlatform:master.

utilities/update_pom_version.sh

@@ -11,8 +11,7 @@
 # Get the previous maven project version.
 CURRENT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
 # Get list of directories for which pom.xml must be updated
-module_folders=($(find . -maxdepth 1 -name 'gcloud-java*' -type d) .)
-
+module_folders=($(find . -maxdepth 2 \( -regex "./gcloud-java[-[a-z]+]+" -o -regex "./gcloud-java-contrib/gcloud-java[-[a-z]+]+" \) -type d) . ./gcloud-java)


aozarov · 2016-04-08T05:09:51Z

Looks good to me few minor comment/questions. Feel free to merge after considering them unless @mziccard has more comments.

ajkannan · 2016-04-08T16:27:30Z

Addressed @aozarov's comments, will wait on hearing from @mziccard before merging.

coveralls · 2016-04-08T16:38:39Z

Changes Unknown when pulling c45bb9f on ajkannan:cleanup-build-scripts into * on GoogleCloudPlatform:master*.

ajkannan · 2016-04-08T16:41:27Z

Found a regex bug. I'm going to do some more in-depth testing before removing the don't merge label.

ajkannan · 2016-04-11T21:41:50Z

Fixed bug and did a bit more testing. Any comments/suggestions @mziccard?

utilities/update_docs_version.sh

@@ -10,7 +10,7 @@ RELEASED_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate
 if [ "${RELEASED_VERSION##*-}" != "SNAPSHOT" ]; then
    echo "Changing version to $RELEASED_VERSION in README files"
    # Get list of directories for which README.md must be updated
-    module_folders=($(find . -maxdepth 1 -name 'gcloud-java*' -type d) .)
+    module_folders=($(find . -maxdepth 2 \( -regex "./gcloud-java[-[a-z]+]+*" -o -regex "./gcloud-java-contrib/gcloud-java[-[a-z]+]+*" \) -type d) . ./gcloud-java)


ajkannan · 2016-04-12T00:03:11Z

@mziccard, the module listing command has been changed so that it works on mac and linux

mziccard · 2016-04-12T11:57:26Z

Looks good to me. You'll have to rebase to fix conflicts. While at it consider squashing the commits.

ajkannan · 2016-04-12T15:07:28Z

Rebased and squashed commits

coveralls · 2016-04-12T15:12:08Z

Coverage remained the same at 85.571% when pulling 159241f on ajkannan:cleanup-build-scripts into de23a12 on GoogleCloudPlatform:master.

🤖 I have created a release *beep* *boop* --- ## [2.3.0](googleapis/java-language@v2.2.0...v2.3.0) (2022-07-01) ### Features * Add Java REST transport to analytics, servicecontrol, servicemanagement, serviceusage and langauge APIs ([5fd7b29](googleapis/java-language@5fd7b29)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.13.0 ([googleapis#858](googleapis/java-language#858)) ([6e4a5f3](googleapis/java-language@6e4a5f3)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

…plugin to v3 (#858) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-deploy-plugin](https://maven.apache.org/plugins/) | `2.8.2` -> `3.0.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/compatibility-slim/2.8.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-deploy-plugin/3.0.0/confidence-slim/2.8.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-document-ai).

…aenterprise to v3.0.3 (#858) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-recaptchaenterprise](https://togithub.com/googleapis/java-recaptchaenterprise) | `3.0.1` -> `3.0.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-recaptchaenterprise/3.0.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-recaptchaenterprise/3.0.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-recaptchaenterprise/3.0.3/compatibility-slim/3.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-recaptchaenterprise/3.0.3/confidence-slim/3.0.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-recaptchaenterprise).

🤖 I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

🤖 I have created a release *beep* *boop* --- ## [1.9.4](googleapis/java-datacatalog@v1.9.3...v1.9.4) (2022-09-17) ### Dependencies * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#858](googleapis/java-datacatalog#858)) ([2568496](googleapis/java-datacatalog@2568496)) * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#861](googleapis/java-datacatalog#861)) ([1e7b196](googleapis/java-datacatalog@1e7b196)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

🤖 I have created a release *beep* *boop* --- ## [2.4.10](https://togithub.com/googleapis/java-accessapproval/compare/v2.4.9...v2.4.10) (2022-10-07) ### Dependencies * Update dependency com.google.cloud:google-cloud-core to v2.8.20 ([googleapis#852](https://togithub.com/googleapis/java-accessapproval/issues/852)) ([2019200](https://togithub.com/googleapis/java-accessapproval/commit/2019200369879480437c77c4d7a1095db61d74f6)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

…onfig to v1.5.1 (#858) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.5.0` -> `1.5.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.1/compatibility-slim/1.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.1/confidence-slim/1.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>googleapis/java-shared-config</summary> ### [`v1.5.1`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#151-httpsgithubcomgoogleapisjava-shared-configcomparev150v151-2022-06-30) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.5.0...v1.5.1) ##### Dependencies - update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 ([#482](https://togithub.com/googleapis/java-shared-config/issues/482)) ([fbfc6dc](https://togithub.com/googleapis/java-shared-config/commit/fbfc6dc1329faaead3a3114c8599d9267722e7f0)) - update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 ([#483](https://togithub.com/googleapis/java-shared-config/issues/483)) ([336cb78](https://togithub.com/googleapis/java-shared-config/commit/336cb7827b36583228c9e2b85871ae72f4c55975)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-core).

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-api-core](https://togithub.com/googleapis/python-api-core) | `==2.8.2` -> `==2.10.2` | [![age](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.2/compatibility-slim/2.8.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-api-core/2.10.2/confidence-slim/2.8.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies).

ajkannan added the build label Apr 5, 2016

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 5, 2016

ajkannan force-pushed the cleanup-build-scripts branch from 7ed51a4 to 7742d0e Compare April 5, 2016 23:53

ajkannan force-pushed the cleanup-build-scripts branch from 112e687 to de646c6 Compare April 6, 2016 03:09

mziccard reviewed Apr 6, 2016
View reviewed changes

ajkannan force-pushed the cleanup-build-scripts branch from 68ff45e to 72aafe4 Compare April 6, 2016 22:24

mziccard reviewed Apr 7, 2016
View reviewed changes

ajkannan force-pushed the cleanup-build-scripts branch from 9a1ffbd to c1b4032 Compare April 8, 2016 00:59

aozarov reviewed Apr 8, 2016
View reviewed changes

ajkannan added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Apr 8, 2016

ajkannan removed the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Apr 11, 2016

mziccard reviewed Apr 11, 2016
View reviewed changes

ajkannan force-pushed the cleanup-build-scripts branch from 50299f9 to 884e33f Compare April 12, 2016 00:40

Cleanup build scripts

159241f

ajkannan force-pushed the cleanup-build-scripts branch from 884e33f to 159241f Compare April 12, 2016 15:06

ajkannan merged commit 67609ee into googleapis:master Apr 12, 2016

ajkannan deleted the cleanup-build-scripts branch April 12, 2016 15:19

mziccard mentioned this pull request Apr 12, 2016

Rename com.google.gcloud to com.google.cloud #899

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup build scripts #858

Cleanup build scripts #858

ajkannan commented Apr 5, 2016

coveralls commented Apr 5, 2016

ajkannan commented Apr 5, 2016

coveralls commented Apr 6, 2016

ajkannan commented Apr 6, 2016

coveralls commented Apr 6, 2016

coveralls commented Apr 6, 2016

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Apr 6, 2016

This comment was marked as spam.

ajkannan commented Apr 6, 2016

This comment was marked as spam.

ajkannan commented Apr 8, 2016

coveralls commented Apr 8, 2016

This comment was marked as spam.

This comment was marked as spam.

aozarov commented Apr 8, 2016

ajkannan commented Apr 8, 2016

coveralls commented Apr 8, 2016

ajkannan commented Apr 8, 2016

ajkannan commented Apr 11, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ajkannan commented Apr 12, 2016

mziccard commented Apr 12, 2016

ajkannan commented Apr 12, 2016

coveralls commented Apr 12, 2016


		3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository. Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR. Be sure that you are not opening the "Pull Request" build logs. When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed. You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number. If the deployment didn't succeed because of a flaky test, rerun the build.
		3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository. Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR. Be sure that you are not opening the "Pull Request" build logs. When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed. Search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number. In rare cases (when the Maven plugin that determines the version of the repository fails), the artifacts may not be deployed even if the version in the pom.xml files don't contain `SNAPSHOT`. If the artifacts weren't deployed due to invalid version parsing or a flaky test, rerun the build.

Cleanup build scripts #858

Cleanup build scripts #858

Conversation

ajkannan commented Apr 5, 2016

coveralls commented Apr 5, 2016

ajkannan commented Apr 5, 2016

coveralls commented Apr 6, 2016

ajkannan commented Apr 6, 2016

coveralls commented Apr 6, 2016

coveralls commented Apr 6, 2016

This comment was marked as spam.

This comment was marked as spam.

coveralls commented Apr 6, 2016

This comment was marked as spam.

ajkannan commented Apr 6, 2016

This comment was marked as spam.

ajkannan commented Apr 8, 2016

coveralls commented Apr 8, 2016

This comment was marked as spam.

This comment was marked as spam.

aozarov commented Apr 8, 2016

ajkannan commented Apr 8, 2016

coveralls commented Apr 8, 2016

ajkannan commented Apr 8, 2016

ajkannan commented Apr 11, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ajkannan commented Apr 12, 2016

mziccard commented Apr 12, 2016

ajkannan commented Apr 12, 2016

coveralls commented Apr 12, 2016