Merge pull request #101 from runtimejs/ci-release

iefserge · iefserge · commit 67a12eb439c7 · 2016-03-27T17:16:38.000+03:00
Automatically release tagged versions
diff --git a/.gitignore b/.gitignore
@@ -25,5 +25,11 @@ disk/boot/initrd-downloaded
 disk/boot/runtime-downloaded
 netdump.txt
 /js/node_modules
+/node_modules
+/out
 /js/initrd
 /build/system/kernel.js
+release.tag
+npm-debug.log
+/src/kernel/version-autogenerated.h
+/runtimecorelib.json
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,5 @@
+/*
+/*/
+!/js/
+!/scripts/
+!/runtimecorelib.json
diff --git a/.runtimeignore b/.runtimeignore
@@ -13,3 +13,15 @@ README.md
 LICENSE.isaac
 LICENSE
 /node_modules/util/test/
+/src
+/deps
+/tmp
+/scripts
+/testcc
+/disk
+/docker
+/docs
+/gen
+/out
+/runtimejs
+*.o
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,23 @@
 language: cpp
 compiler: gcc
 sudo: false
-
 before_script:
-    - cd tools
-    - wget https://github.com/runtimejs/toolchain-bin-linux/raw/master/x86_64-elf-4.9.1-Linux-x86_64.tar.xz
-    - tar -xf x86_64-elf-4.9.1-Linux-x86_64.tar.xz
-    - wget https://github.com/runtimejs/toolchain-bin-linux/raw/master/fasm-1.71.21.tgz
-    - tar -xf fasm-1.71.21.tgz
-    - cd ..
-    - export PATH=$PWD/tools/x86_64-elf-4.9.1-Linux-x86_64/bin:$PWD/tools/fasm:$PATH
-
-script: scons
+- node scripts/make-release.js "$TRAVIS_TAG"
+- cd tools
+- wget https://github.com/runtimejs/toolchain-bin-linux/raw/master/x86_64-elf-4.9.1-Linux-x86_64.tar.xz
+- tar -xf x86_64-elf-4.9.1-Linux-x86_64.tar.xz
+- wget https://github.com/runtimejs/toolchain-bin-linux/raw/master/fasm-1.71.21.tgz
+- tar -xf fasm-1.71.21.tgz
+- cd ..
+- export PATH=$PWD/tools/x86_64-elf-4.9.1-Linux-x86_64/bin:$PWD/tools/fasm:$PATH
+script: RUNTIME_BUILD=release scons
+before_deploy: gzip -k disk/boot/runtime
+deploy:
+  - provider: releases
+    skip_cleanup: true
+    api_key:
+      secure: P+Ei+zxl/jN4Mt+sIm0jfikU0F81yQJEDQgLharThnblm8SILYLZ4jo+vSC7YA5u75wjj6ej3Guxk/Nm0Ajg4C9K7BLVZViZzrRhT8VdxZ8680EOn0A7/abHKA8AT+By8n4sOMhGgbsOLUUHQC+Bo7KLA2S2NGLgHJCKuEatPjg=
+    file: disk/boot/runtime.gz
+    on:
+      tags: true
+      repo: runtimejs/runtime
diff --git a/SConstruct b/SConstruct
@@ -4,10 +4,11 @@ import datetime
 
 SetOption('num_jobs', 4)
 
-build = "debug"
+build = os.getenv('RUNTIME_BUILD', "debug")
+print 'Build', build
 
 config = {
-    "project_name": "runtimejs",
+    "project_name": "out/runtimejs",
     "binary_output_file": "disk/boot/runtime",
     "toolchain_bin_path": "",
     "fasm_pathname": "fasm",
@@ -211,8 +212,12 @@ def BuildProject(env_base):
     env.Replace(LIBS = config["libs"])
     env.Replace(LIBPATH = ['deps'])
 
+    version_header = env.Command('src/kernel/version-autogenerated.h', 'package.json',
+        'node scripts/update-versions.js')
+
     proj_name = config["project_name"]
     env.Depends(proj_name, obj_js);
+    env.Depends(proj_name, version_header)
     env.Depends(proj_name, config["link_script"])
     output_elf = env.Program(proj_name, sources["cc"] + obj_asm)
 
diff --git a/js/index.js b/js/index.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var packagejson = require('./package.json');
+var packagejson = require('../package.json');
 require('module-singleton')(packagejson);
 require('./version');
 
diff --git a/js/runtimecorelib.json b/js/runtimecorelib.json
diff --git a/js/version.js b/js/version.js
@@ -19,7 +19,7 @@ if (!global.__SYSCALL) {
   throw 'error: this program requires runtime.js environment';
 }
 
-var requiredKernelVersion = require('./runtimecorelib.json').kernelVersion;
+var requiredKernelVersion = require('../runtimecorelib.json').kernelVersion;
 var currentKernelVersion = __SYSCALL.version().kernel;
 
 if (currentKernelVersion !== requiredKernelVersion) {
diff --git a/package.json b/package.json
@@ -2,8 +2,10 @@
   "name": "runtimejs",
   "version": "0.2.5",
   "description": "Core runtime.js library",
-  "main": "index.js",
+  "main": "js/index.js",
+  "private": true,
   "scripts": {
+    "postinstall": "node scripts/update-versions.js",
     "lint": "eslint .",
     "test": "runtimeify test/unit/index.js -o initrd && runtime-qemu ./initrd",
     "test-build": "runtimeify test/unit/index.js -o initrd && runtime-qemu ./initrd --kernel ../disk/boot/runtime"
@@ -33,7 +35,6 @@
     "bit-twiddle": "^1.0.2",
     "buffer": "^4.3.0",
     "constants-browserify": "^1.0.0",
-    "eslint": "^1.10.3",
     "event-controller": "^1.0.1",
     "events": "^1.1.0",
     "isint": "^1.0.0",
diff --git a/scripts/helpers/release-id.js b/scripts/helpers/release-id.js
@@ -0,0 +1,15 @@
+var assert = require('assert');
+
+function versionToReleaseId(ver) {
+  var parts = String(ver).split('.');
+  assert(parts.length === 3);
+  var major = parts[0];
+  var minor = parts[1];
+  var patch = parts[2];
+  assert(major < 1024);
+  assert(minor < 1024);
+  assert(patch < 1024);
+  return ((major << 20) + (minor << 10) + patch) >>> 0;
+}
+
+module.exports = versionToReleaseId;
diff --git a/scripts/make-release.js b/scripts/make-release.js
@@ -0,0 +1,33 @@
+var fs = require('fs');
+var path = require('path');
+var assert = require('assert');
+var os = require('os');
+var package = require('../package.json');
+var releaseId = require('./helpers/release-id')(package.version);
+
+// Read tag argument
+var tag = process.argv.slice(2)[0] || 'untagged';
+if (tag === 'untagged') {
+  return;
+}
+
+// Make sure all versions match
+assert(tag === 'v' + package.version, 'tag should match version');
+
+var configKernel = path.join(__dirname, '../src/kernel/version-autogenerated.h');
+assert(fs.readFileSync(configKernel, 'utf8') === String(releaseId), 'kernel version should match package version');
+assert(require('../runtimecorelib.json').kernelVersion === releaseId);
+
+// Remove { private: true } from package.json
+var packageFile = path.join(__dirname, '../js/package.json');
+delete package.private;
+fs.writeFileSync(packageFile, JSON.stringify(package, null, 2) + os.EOL);
+
+console.log('### tag "' + tag + '" (release #' + releaseId.toString(16) + ')');
+
+// Write release ID
+fs.writeFileSync(path.join(__dirname, '../release.tag'), [
+  releaseId.toString(16),
+  tag,
+  new Date().toISOString()
+].join(os.EOL));
diff --git a/scripts/update-versions.js b/scripts/update-versions.js
@@ -0,0 +1,22 @@
+var fs = require('fs');
+var path = require('path');
+var os = require('os');
+var package = require('../package.json');
+var releaseId = require('./helpers/release-id')(package.version);
+
+console.log('### version "' + package.version + '" (release #' + releaseId.toString(16) + ')');
+
+// Write kernel version
+var configKernel = path.join(__dirname, '../src/kernel/version-autogenerated.h');
+try {
+  fs.writeFileSync(configKernel, String(releaseId) + os.EOL);
+} catch (e) {
+  // Ignore this when running on installed package that contains js code only
+}
+
+// Write runtimecorelib.json
+var configCorelib = path.join(__dirname, '../runtimecorelib.json');
+var corelib = {
+  kernelVersion: releaseId
+};
+fs.writeFileSync(configCorelib, JSON.stringify(corelib, null, 2) + os.EOL);
diff --git a/src/kernel/version.h b/src/kernel/version.h
@@ -24,7 +24,9 @@ class Version {
    * Get kernel version represented by a single number.
    */
   static uint32_t getVersionNumber() {
-    return 3;
+    return
+    #include <kernel/version-autogenerated.h>
+    ;
   }
 private:
   ~Version() = delete;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +/*
 +/*/
 +!/js/
 +!/scripts/
 +!/runtimecorelib.json
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ if (!global.__SYSCALL) {`
`19`	`19`	`throw 'error: this program requires runtime.js environment';`
`20`	`20`	`}`
`21`	`21`
`22`		`-var requiredKernelVersion = require('./runtimecorelib.json').kernelVersion;`
	`22`	`+var requiredKernelVersion = require('../runtimecorelib.json').kernelVersion;`
`23`	`23`	`var currentKernelVersion = __SYSCALL.version().kernel;`
`24`	`24`
`25`	`25`	`if (currentKernelVersion !== requiredKernelVersion) {`