diff --git a/release/build_nomulus_for_env.sh b/release/build_nomulus_for_env.sh index 8ffb29a2c..011b38eea 100755 --- a/release/build_nomulus_for_env.sh +++ b/release/build_nomulus_for_env.sh @@ -19,7 +19,7 @@ if [ $# -ne 2 ]; then - echo "Usage: $0 alpha|crash|sandbox|production " + echo "Usage: $0 alpha|crash|sandbox|production|tool " exit 1 fi @@ -27,22 +27,35 @@ environment="$1" dest="$2/$1" gcs_prefix="storage.googleapis.com/domain-registry-maven-repository" -cd gradle -./gradlew clean stage -Penvironment="${environment}" \ - -PmavenUrl=https://"${gcs_prefix}"/maven \ - -PpluginsUrl=https://"${gcs_prefix}"/plugins -cd - +if [ "${environment}" == tool ] +then + mkdir -p "${dest}" -mkdir -p "${dest}" + cd gradle + ./gradlew clean :core:nomulus \ + -PmavenUrl=https://"${gcs_prefix}"/maven \ + -PpluginsUrl=https://"${gcs_prefix}"/plugins + cd - -for service in default pubapi backend tools -do - mv gradle/services/"${service}"/build/staged-app "${dest}/${service}" -done + mv gradle/core/build/libs/nomulus.jar . +else + mkdir -p "${dest}" -mv gradle/core/build/resources/main/google/registry/env/common/META-INF \ - "${dest}/META-INF" + cd gradle + ./gradlew clean stage -Penvironment="${environment}" \ + -PmavenUrl=https://"${gcs_prefix}"/maven \ + -PpluginsUrl=https://"${gcs_prefix}"/plugins + cd - -cd "${dest}" -tar cvf ../../"${environment}.tar" . -cd - + for service in default pubapi backend tools + do + mv gradle/services/"${service}"/build/staged-app "${dest}/${service}" + done + + mv gradle/core/build/resources/main/google/registry/env/common/META-INF \ + "${dest}/META-INF" + + cd "${dest}" + tar cvf ../../"${environment}.tar" . + cd - +fi diff --git a/release/cloudbuild-nomulus.yaml b/release/cloudbuild-nomulus.yaml index 6c3fb2fda..898cff535 100644 --- a/release/cloudbuild-nomulus.yaml +++ b/release/cloudbuild-nomulus.yaml @@ -28,6 +28,9 @@ steps: - name: 'gcr.io/${PROJECT_ID}/builder:latest' args: ['./gradlew', 'test', '-PskipDockerIncompatibleTests=true'] dir: 'gradle' +# Build the tool binary. +- name: 'gcr.io/${PROJECT_ID}/builder:latest' + args: ['release/build_nomulus_for_env.sh', 'tool', 'nomulus'] # Build and package the deployment files for alpha. - name: 'gcr.io/${PROJECT_ID}/builder:latest' args: ['release/build_nomulus_for_env.sh', 'alpha', 'nomulus'] @@ -45,6 +48,7 @@ artifacts: objects: location: 'gs://${PROJECT_ID}-deploy/${TAG_NAME}' paths: + - 'nomulus.jar' - 'alpha.tar' - 'crash.tar' - 'sandbox.tar'