diff options
| -rw-r--r-- | .github/workflows/third_party_update.yml | 5 | ||||
| -rw-r--r-- | buildSrc/src/main/java/deployment/DeploymentPlugin.java | 1 | ||||
| -rw-r--r-- | deployment/build.gradle | 12 |
3 files changed, 13 insertions, 5 deletions
diff --git a/.github/workflows/third_party_update.yml b/.github/workflows/third_party_update.yml index 3a4e35e59..7ace47e6d 100644 --- a/.github/workflows/third_party_update.yml +++ b/.github/workflows/third_party_update.yml @@ -35,8 +35,11 @@ jobs: LATEST_VERSION=$(curl --silent -u "${BOT_USERNAME}:${BOT_TOKEN}" https://api.github.com/repos/gradle/gradle/releases | jq -c -r '.[] | select(.prerelease == false) | .name' | grep -o "${GREP_VERSION_CLASSES}" | uniq | head -n 1) echo "Found version '${LATEST_VERSION}'." ./gradlew wrapper --gradle-version="${LATEST_VERSION}" + ./gradlew wrapper --gradle-version="${LATEST_VERSION}" - name: Sanity verification - run: ./gradlew :api:assembleDebug :api:lintDebug + run: | + ./gradlew :api:assembleDebug :api:lintDebug + ./gradlew :api:assembleDebug :api:lintDebug - name: Add changed gradle files run: | git add -f gradlew* diff --git a/buildSrc/src/main/java/deployment/DeploymentPlugin.java b/buildSrc/src/main/java/deployment/DeploymentPlugin.java index d6ae4a542..3e2584a21 100644 --- a/buildSrc/src/main/java/deployment/DeploymentPlugin.java +++ b/buildSrc/src/main/java/deployment/DeploymentPlugin.java @@ -64,6 +64,7 @@ public class DeploymentPlugin implements Plugin<Project> { stepIndex < config.environmentSteps.size(); stepIndex++) { final String stepName = config.environmentSteps.get(stepIndex); + if (stepName.isEmpty()) continue; project.getTasks() .register( String.format( diff --git a/deployment/build.gradle b/deployment/build.gradle index c62b77143..25335e421 100644 --- a/deployment/build.gradle +++ b/deployment/build.gradle @@ -25,14 +25,14 @@ deployments { environmentSteps = ['alpha_100', 'beta_100'] } imeProduction { - environmentSteps = ['production_010', 'production_020', 'production_030', 'production_040', 'production_050', 'production_075', 'production_100'] + environmentSteps = ['production_010', '', 'production_020', '', '', 'production_030', 'production_040', 'production_050', '', '', '', 'production_075', '', 'production_100'] } addOnsMaster { environmentSteps = ['beta_100'] } addOnsProduction { - environmentSteps = ['production_010', 'production_050', 'production_100'] + environmentSteps = ['production_010', '', 'production_050', '', 'production_100'] } } @@ -50,9 +50,13 @@ long getDaysFromLastCommitFromGit() { static String getTaskNameByStepFor(Project project, String processName, long step) { def processSteps = project.deployments.named(processName).get().environmentSteps if (step >= processSteps.size()) { - step = processSteps.size() - 1 + return 'noOpDeployTask' } - return "deploymentRequest_${processName}_${processSteps[step]}" + def targetEnvironment = processSteps[step] + if (targetEnvironment == '') { + return 'noOpDeployTask' + } + return "deploymentRequest_${processName}_${targetEnvironment}" } //////// start - IME |