diff --git a/java_common.gradle b/java_common.gradle index 16430215a..71e05c0a9 100644 --- a/java_common.gradle +++ b/java_common.gradle @@ -54,7 +54,6 @@ tasks.withType(JavaCompile).configureEach { } } -version = '1.0' sourceCompatibility = '1.8' targetCompatibility = '1.8' diff --git a/release/cloudbuild-nomulus.yaml b/release/cloudbuild-nomulus.yaml index 8f274374e..135ce674c 100644 --- a/release/cloudbuild-nomulus.yaml +++ b/release/cloudbuild-nomulus.yaml @@ -65,7 +65,22 @@ steps: # Build and package the deployment files for production. - name: 'gcr.io/${PROJECT_ID}/builder:latest' args: ['release/build_nomulus_for_env.sh', 'production', 'output'] -# The tarballs to upload to GCS. +# Tentatively build and publish Cloud SQL schema jar here, before schema release +# process is finalized. +- name: 'gcr.io/${PROJECT_ID}/builder:latest' + entrypoint: /bin/bash + args: + - -c + - | + set -e + ./gradlew \ + :db:publish \ + -PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven \ + -PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins \ + -Pschema_publish_repo=gcs://domain-registry-maven-repository/nomulus \ + -Pschema_version=${TAG_NAME} + cp db/build/libs/schema.jar output/ +# The tarballs and jars to upload to GCS. artifacts: objects: location: 'gs://${PROJECT_ID}-deploy/${TAG_NAME}' @@ -73,6 +88,7 @@ artifacts: - 'output/*.tar' - 'output/tag_name' - 'output/nomulus.jar' + - 'output/schema.jar' - 'release/cloudbuild-tag.yaml' - 'release/cloudbuild-sync.yaml' - 'release/cloudbuild-deploy-*.yaml'