Canner · kokokuo · Sep 21, 2022 · Sep 8, 2022 · Sep 8, 2022 · Sep 13, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,6 +8,11 @@ executors:
       # https://github.com/facebook/jest/issues/11956
       - image: cimg/node:16.10.0
 
+parameters:
+  workflow_name:
+    type: string
+    default: 'none'
+
 # Set some environment variables like the base SHA of PRs ...etc.
 set_env: &set_env
   name: Setup Environment Variables
@@ -26,11 +31,21 @@ set_env: &set_env
       echo 'export AFFECTED_ARGS="--head=HEAD --base=${CIRCLE_PR_BASE_SHA}"' >> $BASH_ENV
 
     elif [ "$CIRCLE_BRANCH" == "develop" ]; then
-      # Merge into develop branch, use main branch as the base.
-
-      echo "Using main branch as the base"
-      echo 'export AFFECTED_ARGS="--head=HEAD --base=origin/main"' >> $BASH_ENV 
-
+      # Use the last build commit if there is nightly-build tag
+
+      last_commit="$(git rev-list -n 1 tags/nightly-build || echo '')"
+
+      # Check whether the commit is on the target branch
+      if [ "$last_commit" != "" ] && [ "$(git merge-base $last_commit $CIRCLE_BRANCH)" == "$last_commit" ]; then
+        # use last build sha as the base.
+        echo "Using $last_commit as the base (last build)"
+        echo "export AFFECTED_ARGS=\"--head=HEAD --base=$last_commit\"" >> $BASH_ENV
+      else
+        # use main branch as the base.
+        echo "Using main branch as the base"
+        echo 'export AFFECTED_ARGS="--head=HEAD --base=origin/main"' >> $BASH_ENV 
+      fi
+
     else
 
       echo "Testing/Linting on all packages"
@@ -136,9 +151,52 @@ jobs:
               echo "No coverage report found."
             fi
 
+  nightly-build:
+    executor: node-executor
+    steps:
+      # Using the deployment key with write access
+      - add_ssh_keys:
+          fingerprints:
+            - 'd8:c0:e1:c8:8b:8d:dd:f8:50:cd:d9:34:1c:21:3d:85'
+      - checkout
+      - run:
+          <<: *set_env
+      - restore_cache:
+          <<: *yarn_cache
+      # Setup remote docker to build image
+      # https://circleci.com/docs/building-docker-images
+      - setup_remote_docker
+      - run:
+          name: NPM publish
+          # running with yarn nx causes npm config issues
+          command: ./node_modules/.bin/nx affected --target=publish ${AFFECTED_ARGS} --tag dev
+          environment:
+            READY_FOR_PUBLISH: 'true'
+      - run:
+          name: Docker login
+          command: echo "${GITHUB_PAT}" | docker login ghcr.io -u ${GITHUB_USER} --password-stdin
+      - run:
+          name: Docker publish
+          command: yarn nx affected --target=publish:docker ${AFFECTED_ARGS} --tag dev
+          environment:
+            READY_FOR_PUBLISH: 'true'
+      # After a success build, move the tag nightly-build to HEAD
+      - run:
+          name: Move nightly-build tag
+          command: |
+            # delete remote tag
+            git push origin :refs/tags/nightly-build
+            # tag current HEAD
+            git tag -f nightly-build
+            # push tag
+            git push origin $CIRCLE_BRANCH --tags
+
 workflows:
   version: 2
   pr-check:
+    when:
+      not:
+        equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       - install
       - lint:
@@ -147,3 +205,25 @@ workflows:
       - test:
           requires:
             - install
+  nightly-build:
+    when:
+      or:
+        - and:
+            - equal: [scheduled_pipeline, << pipeline.trigger_source >>]
+            - equal: ['nightly build', << pipeline.schedule.name >>]
+        - and:
+            - equal: [api, << pipeline.trigger_source >>]
+            - equal: ['nightly build', << pipeline.parameters.workflow_name >>]
+    jobs:
+      - install
+      - lint:
+          requires:
+            - install
+      - test:
+          requires:
+            - install
+      - nightly-build:
+          requires:
+            - install
+            - lint
+            - test
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vulcan-sql/build",
   "description": "VulcanSQL package for building projects",
-  "version": "0.1.0-alpha.1",
+  "version": "0.2.0",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@vulcan-sql/core": "0.1.0-alpha.1"
+    "@vulcan-sql/core": "~0.2.0-0"
   }
 }
diff --git a/packages/build/project.json b/packages/build/project.json
@@ -49,7 +49,7 @@
     "publish": {
       "executor": "@nrwl/workspace:run-commands",
       "options": {
-        "command": "node ../../../tools/scripts/publish.mjs {args.tag}",
+        "command": "node ../../../tools/scripts/publish.mjs {args.tag} {args.version}",
         "cwd": "dist/packages/build"
       },
       "dependsOn": [

diff --git a/packages/cli/Dockerfile b/packages/cli/Dockerfile
@@ -2,7 +2,8 @@ FROM node:16-alpine
 # Annotation required by Github to link with our repository
 LABEL org.opencontainers.image.source https://github.com/canner/vulcan-sql
 
-COPY ../../dist/packages/cli/ /usr/cli
+# We'll execute docker build from project root. Using absolute path to avoid "forbidden path outside the build contex" error
+COPY /dist/packages/cli/ /usr/cli
 WORKDIR /usr/cli
 ENV NODE_ENV=production
 RUN npm i

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vulcan-sql/cli",
   "description": "CLI tools for VulcanSQL",
-  "version": "0.1.0-alpha.1",
+  "version": "0.2.0",
   "type": "commonjs",
   "bin": {
     "vulcan": "./src/index.js"

diff --git a/packages/cli/project.json b/packages/cli/project.json
@@ -43,7 +43,7 @@
     "publish": {
       "executor": "@nrwl/workspace:run-commands",
       "options": {
-        "command": "node ../../../tools/scripts/publish.mjs {args.tag}",
+        "command": "node ../../../tools/scripts/publish.mjs {args.tag} {args.version}",
         "cwd": "dist/packages/cli"
       },
       "dependsOn": [

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -17,6 +17,7 @@ program
   .argument('[path]', 'folder path to initialize Vulcan project')
   .description('create a new Vulcan project')
   .option('-p --project-name <project-name>', 'specify project name')
+  .option('-v --version <version>', 'specify Vulcan version')
   .action(async (path: string | undefined, options) => {
     await handleInit(path, options || {});
   });

diff --git a/packages/cli/src/commands/serve.ts b/packages/cli/src/commands/serve.ts
@@ -23,8 +23,8 @@ export const serveVulcan = async (options: ServeCommandOptions) => {
   // Start server
   logger.info(`Starting server...`);
   const server = new VulcanServer(config);
-  await server.start(options.port);
-  logger.info(`Server is listening at port ${options.port}.`);
+  await server.start();
+  logger.info(`Server is listening at port ${config.port || 3000}.`);
   addShutdownJob(async () => {
     logger.info(`Stopping server...`);
     await server.close();

diff --git a/packages/cli/src/schemas/init/vulcan.yaml b/packages/cli/src/schemas/init/vulcan.yaml
@@ -21,3 +21,5 @@ document-generator:
   folderPath: .
 types:
   - RESTFUL
+enforce-https:
+  enabled: false
diff --git a/packages/cli/test/cli.spec.ts b/packages/cli/test/cli.spec.ts
@@ -4,16 +4,36 @@ import * as jsYAML from 'js-yaml';
 import * as path from 'path';
 import { runShutdownJobs } from '../src/utils';
 import * as supertest from 'supertest';
+import faker from '@faker-js/faker';
 
 const projectName = 'test-vulcan-project';
+const testingVersion = '0.1.2-dev.20220913.0';
+const testingServerPort = faker.datatype.number({ min: 20000, max: 30000 });
 
 const workspaceRoot = path.resolve(__dirname, '..', '..', '..');
 const projectRoot = path.resolve(workspaceRoot, projectName);
 
 beforeAll(async () => {
   await fs.rm(projectRoot, { recursive: true, force: true });
-  await program.parseAsync(['node', 'vulcan', 'init', '-p', projectName]);
+  await program.parseAsync([
+    'node',
+    'vulcan',
+    'init',
+    '-p',
+    projectName,
+    '-v',
+    testingVersion,
+  ]);
   process.chdir(projectRoot);
+  const projectConfig = jsYAML.load(
+    await fs.readFile(path.resolve(projectRoot, 'vulcan.yaml'), 'utf-8')
+  ) as Record<string, any>;
+  projectConfig['port'] = testingServerPort;
+  fs.writeFile(
+    path.resolve(projectRoot, 'vulcan.yaml'),
+    jsYAML.dump(projectConfig),
+    'utf-8'
+  );
 }, 30000);
 
 afterAll(async () => {
@@ -45,19 +65,19 @@ it('Build command should make result.json', async () => {
 it('Serve command should start Vulcan server', async () => {
   // Action
   await program.parseAsync(['node', 'vulcan', 'build']);
-  await program.parseAsync(['node', 'vulcan', 'serve', '-p', '12345']);
-  const agent = supertest('http://localhost:12345');
-  const result = await agent.get('/');
+  await program.parseAsync(['node', 'vulcan', 'serve']);
+  const agent = supertest(`http://localhost:${testingServerPort}`);
+  const result = await agent.get('/doc');
   // Assert
   expect(result.statusCode).toBe(200);
   await runShutdownJobs();
 });
 
 it('Start command should build the project and start Vulcan server', async () => {
   // Action
-  await program.parseAsync(['node', 'vulcan', 'start', '-p', '12345']);
-  const agent = supertest('http://localhost:12345');
-  const result = await agent.get('/');
+  await program.parseAsync(['node', 'vulcan', 'start']);
+  const agent = supertest(`http://localhost:${testingServerPort}`);
+  const result = await agent.get('/doc');
   // Assert
   expect(result.statusCode).toBe(200);
   await runShutdownJobs();

diff --git a/packages/cli/test/init.spec.ts b/packages/cli/test/init.spec.ts
@@ -4,7 +4,8 @@ import * as jsYAML from 'js-yaml';
 import * as path from 'path';
 import { runShutdownJobs } from '../src/utils';
 
-const projectName = 'test-vulcan-project';
+const projectName = 'test-vulcan-project-init';
+const testingVersion = '0.1.2-dev.20220913.0';
 
 const workspaceRoot = path.resolve(__dirname, '..', '..', '..');
 const projectRoot = path.resolve(workspaceRoot, `${projectName}-with-path`);
@@ -29,6 +30,8 @@ it('Init command with folder path should create default config in target folder'
     'init',
     '-p',
     projectName,
+    '-v',
+    testingVersion,
     projectRoot,
   ]);
   // Action

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vulcan-sql/core",
   "description": "Core package of VulcanSQL",
-  "version": "0.1.0-alpha.1",
+  "version": "0.2.0",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"

diff --git a/packages/core/project.json b/packages/core/project.json
@@ -43,7 +43,7 @@
     "publish": {
       "executor": "@nrwl/workspace:run-commands",
       "options": {
-        "command": "node ../../../tools/scripts/publish.mjs {args.tag}",
+        "command": "node ../../../tools/scripts/publish.mjs {args.tag} {args.version}",
         "cwd": "dist/packages/core"
       },
       "dependsOn": [

diff --git a/packages/extension-dbt/package.json b/packages/extension-dbt/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vulcan-sql/extension-dbt",
   "description": "Using dbt models form VulcanSQL projects",
-  "version": "0.1.0-alpha.1",
+  "version": "0.2.0",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -23,6 +23,6 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@vulcan-sql/core": "0.x"
+    "@vulcan-sql/core": "~0.2.0-0"
   }
 }
diff --git a/packages/extension-dbt/project.json b/packages/extension-dbt/project.json
@@ -49,7 +49,7 @@
     "publish": {
       "executor": "@nrwl/workspace:run-commands",
       "options": {
-        "command": "node ../../../tools/scripts/publish.mjs {args.tag}",
+        "command": "node ../../../tools/scripts/publish.mjs {args.tag} {args.version}",
         "cwd": "dist/packages/extension-dbt"
       },
       "dependsOn": [

diff --git a/packages/extension-debug-tools/package.json b/packages/extension-debug-tools/package.json
@@ -1,9 +1,28 @@
 {
   "name": "@vulcan-sql/extension-debug-tools",
-  "version": "0.1.0-alpha.1",
+  "description": "A collection of Vulcan extension debug tools",
+  "version": "0.2.0",
   "type": "commonjs",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "vulcan",
+    "vulcan-sql",
+    "data",
+    "sql",
+    "database",
+    "data-warehouse",
+    "data-lake",
+    "api-builder"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Canner/vulcan.git"
+  },
+  "license": "MIT",
   "peerDependencies": {
-    "@vulcan-sql/core": "*"
+    "@vulcan-sql/core": "~0.2.0-0"
   },
   "devDependencies": {
     "@vulcan-sql/test-utility": "0.1.0-alpha.1"

diff --git a/packages/extension-debug-tools/project.json b/packages/extension-debug-tools/project.json
@@ -34,7 +34,7 @@
     "publish": {
       "executor": "@nrwl/workspace:run-commands",
       "options": {
-        "command": "node ../../../tools/scripts/publish.mjs {args.tag}",
+        "command": "node ../../../tools/scripts/publish.mjs {args.tag} {args.version}",
         "cwd": "dist/packages/extension-debug-tools"
       },
       "dependsOn": [

diff --git a/packages/serve/package.json b/packages/serve/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vulcan-sql/serve",
   "description": "VulcanSQL package for serving projects",
-  "version": "0.1.0-alpha.1",
+  "version": "0.2.0",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@vulcan-sql/core": "0.1.0-alpha.1"
+    "@vulcan-sql/core": "~0.2.0-0"
   }
 }
diff --git a/packages/serve/project.json b/packages/serve/project.json
@@ -59,7 +59,7 @@
     "publish": {
       "executor": "@nrwl/workspace:run-commands",
       "options": {
-        "command": "node ../../../tools/scripts/publish.mjs {args.tag}",
+        "command": "node ../../../tools/scripts/publish.mjs {args.tag} {args.version}",
         "cwd": "dist/packages/serve"
       },
       "dependsOn": [