From 25d4cb2aab0fdc10ca80514a7659b4ba4a7b322f Mon Sep 17 00:00:00 2001
From: Simon Genin <SimonGenin@users.noreply.github.com>
Date: Tue, 20 Oct 2020 16:36:14 +0200
Subject: [PATCH] Improve the release script for easier deployment (#771)

Co-authored-by: Simon Genin (ges) <ges@odoo.com>
---
 README.md        |  3 +-
 tools/release.js | 83 ++++++++++++++----------------------------------
 2 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index 5196747b..8cecc5e1 100644
--- a/README.md
+++ b/README.md
@@ -121,8 +121,7 @@ npm install @odoo/owl
 
 If you want to use a simple `<script>` tag, the last release can be downloaded here:
 
-- [owl-1.0.11.js](https://github.com/odoo/owl/releases/download/v1.0.11/owl.js)
-- [owl-1.0.11.min.js](https://github.com/odoo/owl/releases/download/v1.0.11/owl.min.js)
+- [owl-1.0.11](https://github.com/odoo/owl/releases/tag/v1.0.11)
 
 ## License
 
diff --git a/tools/release.js b/tools/release.js
index 8b6ac977..c1a69e75 100644
--- a/tools/release.js
+++ b/tools/release.js
@@ -3,10 +3,9 @@ const readline = require("readline");
 const fs = require("fs");
 const exec = require("child_process").exec;
 const chalk = require("chalk");
-const GitHub = require("github-api");
 
 const REL_NOTES_FILE = `release-notes.md`;
-const STEPS = 10;
+const STEPS = 8;
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -28,7 +27,8 @@ async function startRelease() {
   // ---------------------------------------------------------------------------
   log(`Step 1/${STEPS}: collecting info...`);
   const current = package.version;
-  const next = await ask("Next version: ");
+  let next = await ask("Next version: ");
+  if (next[0] === 'v') next = next.substring(1);
   let file = await ask(`Release notes (${REL_NOTES_FILE}): `);
   file = file || REL_NOTES_FILE;
   let content;
@@ -39,11 +39,12 @@ async function startRelease() {
     log("Cannot find release notes... Aborting");
     return;
   }
-
-  // Todo: add playground update feature
-  // let shouldUpdateStr = await ask("Update Playground? (y/n)");
-  // const shouldUpdatePlayground = shouldUpdateStr === "y";
-  const token = await ask("Github token: ");
+  let shouldBeDraft = await ask(`Should be a draft [y/n] ? (n)`);
+  let draft = ""
+  if (shouldBeDraft.toLowerCase() === 'y')
+  {
+    draft = "--draft";
+  }
 
   // ---------------------------------------------------------------------------
   log(`Step 2/${STEPS}: running tests...`);
@@ -52,14 +53,12 @@ async function startRelease() {
     log("Test suite does not pass. Aborting.");
     return;
   }
-  await ask("Ready for next step...");
 
   // ---------------------------------------------------------------------------
   log(`Step 3/${STEPS}: updating package.json, readme.md and roadmap.md...`);
   await replaceInFile("./package.json", current, next);
   await replaceInFile("./README.md", current, next);
   await replaceInFile("./roadmap.md", current, next);
-  await ask("Ready for next step...");
 
   // ---------------------------------------------------------------------------
   log(`Step 4/${STEPS}: creating git commit...`);
@@ -68,61 +67,40 @@ async function startRelease() {
     log("Git commit failed. Aborting.");
     return;
   }
-  await ask("Ready for next step...");
 
-  // -------------------j--------------------------------------------------------
-  log(`Step 5/${STEPS}: building owl (iife version)...`);
+  // ----------------------------------------------------------------------------
+  log(`Step 5/${STEPS}: building owl...`);
+  await execCommand("npm run prettier");
   const buildResult = await execCommand("npm run build");
   if (buildResult !== 0) {
     log("Build failed. Aborting.");
     return;
   }
-  await ask("Ready for next step...");
 
   // ---------------------------------------------------------------------------
-  log(`Step 6/${STEPS}: minifying owl...`);
-  const minifyResult = await execCommand("npm run minify");
-  if (minifyResult !== 0) {
-    log("Minify failed. Aborting.");
-    return;
-  }
-  await ask("Ready for next step...");
-
-  // ---------------------------------------------------------------------------
-  log(`Step 7/${STEPS}: pushing on github...`);
+  log(`Step 6/${STEPS}: pushing on github...`);
   const pushResult = await execCommand("git push");
   if (pushResult !== 0) {
     log("git push failed. Aborting.");
     return;
   }
-  await ask("Ready for next step...");
 
   // ---------------------------------------------------------------------------
-  log(`Step 8/${STEPS}: publishing release notes on github...`);
-  const options = {
-    tag_name: `v${next}`,
-    name: `v${next}`,
-    body: content,
-    draft: true // todo: remove this someday
-  };
-  const result = await createRelease(token, options);
-  await ask("Ready for next step...");
 
-  // ---------------------------------------------------------------------------
-  log(`Step 9/${STEPS}: adding assets to release...`);
-  await ask("Please add owl.js and owl.min.js to draft release, then confirm");
-  // todo: do this with curl
-  // curl \
-  //   -H "Authorization: token $GITHUB_TOKEN" \
-  //   -H "Content-Type: $(file -b --mime-type $FILE)" \
-  //   --data-binary @$FILE \
-  //   "https://uploads.github.com/repos/hubot/singularity/releases/123/assets?name=$(basename $FILE)"
+  log('Step 7/${STEPS}: Creating the release...');
+  const relaseResult = await execCommand(`gh release create v${next} dist/*.js ${draft} -F release-notes.md`);
+  if (relaseResult !== 0) {
+    log("github release failed. Aborting.");
+    return;
+  }
 
-  // ---------------------------------------------------------------------------
-  log(`Step 10/${STEPS}: publishing module on npm...`);
+  log(`Step 8/${STEPS}: publishing module on npm...`);
   await execCommand("npm run publish");
-
+  
   log("Owl Release process completed! Thank you for your patience");
+  await execCommand(`gh release view`);
+  await execCommand(`gh release view -w`);
+
 }
 
 // -----------------------------------------------------------------------------
@@ -199,16 +177,3 @@ async function replaceInFile(file, from, to) {
     });
   });
 }
-
-function createRelease(token, options) {
-  return new Promise((resolve, reject) => {
-    var gh = new GitHub({ token });
-    gh.getRepo("odoo", "owl").createRelease(options, (err, result, req) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(result);
-      }
-    });
-  });
-}