[friction] support for local dev-channel deploy (#340)

Author: pq

third_party/build.gradle.kts

@@ -45,8 +45,14 @@ intellijPlatform {
             val datestamp = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now())
             val baseVersion = "$nextMajorVersion.0.0-dev.$datestamp"
 
-            val commitHash = System.getenv("KOKORO_GIT_COMMIT")
-            version = if (commitHash != null) "$baseVersion-${commitHash.take(7)}" else baseVersion
+            val commitHash = System.getenv("KOKORO_GIT_COMMIT") ?: try {
+                providers.exec {
+                    commandLine("git", "rev-parse", "--short", "HEAD")
+                }.standardOutput.asText.get().trim()
+            } catch (e: Exception) {
+                ""
+            }
+            version = if (commitHash.isNotEmpty()) "$baseVersion-${commitHash.take(7)}" else baseVersion
         } else {
             version = providers.gradleProperty("pluginVersion")
         }
@@ -253,8 +259,16 @@ tasks.register("printCompileClasspath") {
     }
 }
 
-tasks.register("printVersion") {
-    doLast {
-        println(intellijPlatform.pluginConfiguration.version.get())
+abstract class PrintVersionTask : org.gradle.api.DefaultTask() {
+    @get:org.gradle.api.tasks.Input
+    abstract val pluginVersion: org.gradle.api.provider.Property<String>
+
+    @org.gradle.api.tasks.TaskAction
+    fun action() {
+        println(pluginVersion.get())
     }
 }
+
+tasks.register<PrintVersionTask>("printVersion") {
+    pluginVersion.set(intellijPlatform.pluginConfiguration.version)
+}

third_party/tool/kokoro/deploy.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# To run this script locally from the repository root:
+# JB_MARKETPLACE_TOKEN="your_real_token" ./third_party/tool/kokoro/deploy.sh
+
 source ./third_party/tool/kokoro/setup.sh
 setup
 
@@ -18,12 +21,18 @@ echo "kokoro deploy start"
 DART_KEYSTORE_ID=74840
 DART_KEYSTORE_NAME=jetbrains-plugin-upload-auth-token
 
-KOKORO_TOKEN_FILE="${KOKORO_KEYSTORE_DIR}/${DART_KEYSTORE_ID}_${DART_KEYSTORE_NAME}"
-if [ ! -f "$KOKORO_TOKEN_FILE" ]; then
-  echo "Error: Keystore token file not found at $KOKORO_TOKEN_FILE"
-  exit 1
+if [ -n "$JB_MARKETPLACE_TOKEN" ]; then
+  TOKEN="$JB_MARKETPLACE_TOKEN"
+  echo "Using token from JB_MARKETPLACE_TOKEN environment variable."
+else
+  KOKORO_TOKEN_FILE="${KOKORO_KEYSTORE_DIR}/${DART_KEYSTORE_ID}_${DART_KEYSTORE_NAME}"
+  if [ ! -f "$KOKORO_TOKEN_FILE" ]; then
+    echo "Error: Keystore token file not found at $KOKORO_TOKEN_FILE"
+    echo "Please set JB_MARKETPLACE_TOKEN or ensure KOKORO_KEYSTORE_DIR is set correctly."
+    exit 1
+  fi
+  TOKEN=$(cat "$KOKORO_TOKEN_FILE")
 fi
-TOKEN=$(cat "$KOKORO_TOKEN_FILE")
 
 ZIP_FILE="build/distributions/Dart.zip"
 if [ ! -f "$ZIP_FILE" ]; then