Merge pull request #374 from JarvusInnovations/feat/remove-habitat

feat(action): remove habitat dependence

Author: themightychris

.github/workflows/pr-test.yml

@@ -2,31 +2,58 @@ name: 'PR: Test'
 
 on: pull_request
 
-env:
-  HAB_LICENSE: accept-no-persist
-
 jobs:
-  pr-test:
+  test-cli:
+
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - uses: actions/checkout@v4
+
+      - name: Configure git identity
+        run: |
+          git config user.name "Github Action $GITHUB_JOB"
+          git config user.email "$(whoami)@$(uname -n)"
+
+      - run: npm install
+
+      - name: 'Test projection: github-action-projector'
+        run: node bin/cli.js project --no-cache-from --cache-to=origin github-action-projector
+
+      - name: 'Test projection: docs-site'
+        run: node bin/cli.js project --no-cache-from --cache-to=origin docs-site
+
+  test-action:
 
     runs-on: ubuntu-latest
     steps:
 
-    - name: 'Initialize Chef Habitat environment'
-      uses: JarvusInnovations/habitat-action@action/v1
-      with:
-        deps: |
-          core/hab-plan-build
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
 
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-    - name: 'Generate origin key: jarvus'
-      run: hab origin key generate jarvus
+      - run: npm install
+        working-directory: github-actions/projector
 
-    - name: Build jarvus/hologit
-      run: hab pkg exec core/hab-plan-build hab-plan-build .
+      - name: Install local hologit
+        run: |
+          npm install
+          npm link
 
-    - name: 'Test projection: docs-site'
-      run: hab pkg exec jarvus/hologit/0.0.1 git-holo project --no-cache-from --cache-to=origin docs-site
+      - name: 'Test projection action: github-action-projector'
+        uses: ./github-actions/projector/
+        with:
+          holobranch: github-action-projector
+          cache: false
 
-    - name: 'Test projection: github-action-projector'
-      run: hab pkg exec jarvus/hologit/0.0.1 git-holo project --no-cache-from --cache-to=origin github-action-projector
+      - name: 'Test projection action: docs-site'
+        uses: ./github-actions/projector/
+        with:
+          holobranch: docs-site
+          cache: false

.github/workflows/publish-npm.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v4
       with:
-        node-version: '14.x'
+        node-version: '20.x'
         registry-url: 'https://registry.npmjs.org'
 
     - uses: actions/checkout@v2

.holo/branches/docs-site.lenses/mkdocs.toml

@@ -1,5 +1,7 @@
 [hololens]
-package = "holo/lens-mkdocs"
+container = "ghcr.io/hologit/lenses/mkdocs:latest"
+
+[hololens.mkdocs]
 requirements = [
     "mkdocs-material",
     "mkdocs-awesome-pages-plugin",

.holo/branches/github-action-projector.lenses/npm-install.toml

@@ -1,5 +1,5 @@
 [hololens]
-package = "holo/lens-npm-install/16"
+container = "ghcr.io/hologit/lenses/npm-install:latest"
 
 [hololens.input]
 files = [

.tool-versions

@@ -0,0 +1 @@
+nodejs 20.19.3

.vscode/launch.json

@@ -308,6 +308,20 @@
                 "4e78f11a2d8ba8cc462e8e6ace46d2a71d002774",
                 "da4534092d66f23e29c69e485f544f88636639c0"
             ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "github-actions/projector",
+            "program": "${workspaceFolder}/github-actions/projector/index.js",
+            "cwd": "${workspaceFolder}/.scratch/test-wd",
+            "env": {
+                "GITHUB_ACTOR": "github-action",
+                "GITHUB_REPOSITORY": "JarvusInnovations/hologit",
+                "GITHUB_REF": "refs/heads/develop",
+                "INPUT_HOLOBRANCH": "github-action-projector",
+                "INPUT_REF": "refs/heads/develop"
+            }
         }
     ]
 }

github-actions/projector/action.yml

@@ -14,6 +14,10 @@ inputs:
     commit-to:
       description: 'Name of branch/ref to optionally commit result to'
       required: false
+    cache:
+      description: 'Whether to use cache (true/false)'
+      required: false
+      default: 'true'
 outputs:
   tree:
     description: 'Tree hash for last projection'
@@ -22,4 +26,3 @@ outputs:
 runs:
   using: 'node20'
   main: 'index.js'
-  post: 'post.js'

github-actions/projector/index.js

@@ -1,6 +1,5 @@
 const core = require('@actions/core');
 const { exec } = require('@actions/exec');
-const io = require('@actions/io');
 
 
 // gather input
@@ -12,6 +11,7 @@ const fetch = core.getInput('fetch') !== 'false';
 const holobranch = core.getInput('holobranch', { required: true });
 const lens = core.getInput('lens');
 const commitTo = core.getInput('commit-to', { required: false });
+const cache = core.getInput('cache') !== 'false';
 const commitToRef = commitTo
     ? (
         commitTo == 'HEAD' || commitTo.startsWith('refs/')
@@ -28,22 +28,21 @@ try {
 }
 
 async function run() {
-    try {
-        await require('habitat-action');
-    } catch (err) {
-        core.setFailed(`Failed to run habitat-action: ${err.message}`);
-        return;
-    }
-
+    // check if git-holo is already installed
+    const isInstalled = await exec('which', ['git-holo'], { ignoreReturnCode: true, silent: true }) === 0;
 
-    try {
-        core.startGroup('Installing Jarvus Hologit');
-        await exec('hab pkg install jarvus/hologit');
-    } catch (err) {
-        core.setFailed(`Failed to install Jarvus Hologit: ${err.message}`);
-        return;
-    } finally {
-        core.endGroup();
+    if (isInstalled) {
+        core.info('Hologit is already installed, skipping npm install');
+    } else {
+        try {
+            core.startGroup('Installing Jarvus Hologit');
+            await exec('npm install -g hologit');
+        } catch (err) {
+            core.setFailed(`Failed to install Jarvus Hologit: ${err.message}`);
+            return;
+        } finally {
+            core.endGroup();
+        }
     }
 
 
@@ -151,11 +150,15 @@ async function run() {
         core.startGroup(`Projecting holobranch: ${holobranch}`);
         const projectionArgs = [
             holobranch,
-            `--ref=${ref}`,
-            '--cache-from=origin',
-            '--cache-to=origin'
+            `--ref=${ref}`
         ];
 
+        if (cache) {
+            projectionArgs.push('--cache-from=origin', '--cache-to=origin');
+        } else {
+            projectionArgs.push('--no-cache-from', '--no-cache-to');
+        }
+
         if (debug) {
             projectionArgs.push('--debug');
         }
@@ -209,17 +212,15 @@ async function run() {
 }
 
 async function gitExec(command, args = [], options = {}) {
-    return exec('hab pkg exec jarvus/hologit', [
-        'git',
+    return exec('git', [
         '--no-pager',
         command,
         ...args
     ], options);
 }
 
 async function gitExecOutput(command, args = [], options = {}) {
-    return execOutput('hab pkg exec jarvus/hologit', [
-        'git',
+    return execOutput('git', [
         '--no-pager',
         command,
         ...args