add scripts to correct folder

gvkhna · May 28, 2024 · 9bc13a0 · 9bc13a0
1 parent d16f3a3
commit 9bc13a0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
@@ -25,6 +25,7 @@ jobs:
           asdf reshim
           make proto
           goreleaser release --skip=publish --snapshot --clean
+          ./scripts/create-main-npm-package.sh
           ls dist/
 
       # - name: Set up Go

diff --git a/cli/.goreleaser.yaml b/cli/.goreleaser.yaml
@@ -19,7 +19,7 @@ builds:
       - arm64
     ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.buildTime={{.Date}}`.
     hooks:
-      post: .github/scripts/create-arch-npm-package.sh {{ .Os }} {{ .Arch }} {{ .Path }} {{ .Version }}
+      post: scripts/create-arch-npm-package.sh {{ .Os }} {{ .Arch }} {{ .Path }} {{ .Version }}
 
 archives:
   - format: tgz

diff --git a/scripts/create-arch-npm-package.sh → cli/scripts/create-arch-npm-package.sh b/scripts/create-arch-npm-package.sh → cli/scripts/create-arch-npm-package.sh
@@ -26,10 +26,12 @@ cp "${FULL_BINARY_PATH}" "${BIN_FOLDER}/"
 # Create package.json
 cat > "${PACKAGE_DIR}/package.json" <<EOF
 {
+  "author": "Gaurav Khanna",
+  "cpu": ["${ARCH}"],
   "name": "${PACKAGE_NAME}",
-  "version": "${VERSION}",
   "os": ["${OS}"],
-  "cpu": ["${ARCH}"]
+  "repository": "github:gvkhna/warpdive",
+  "version": "${VERSION}"
 }
 EOF
 

diff --git a/scripts/create-main-npm-package.sh → cli/scripts/create-main-npm-package.sh b/scripts/create-main-npm-package.sh → cli/scripts/create-main-npm-package.sh
@@ -3,7 +3,9 @@
 # Define base directories
 SOURCE_DIR="warpdive"
 TARGET_DIR="dist/npm/warpdive"
-VERSION=$1
+
+# Get the current Git tag
+VERSION=$(git describe --tags --abbrev=0)
 
 # Create necessary directories
 mkdir -p "${TARGET_DIR}/bin/"
@@ -15,25 +17,26 @@ cp "${SOURCE_DIR}/install.js" "${TARGET_DIR}/"
 # Create package.json
 cat > "${TARGET_DIR}/package.json" <<EOF
 {
+  "author": "Gaurav Khanna",
+  "description": "Warpdive is a docker/oci container layer browser. Learn more at warpdive.xyz.",
+  "keywords": ["warpdive", "cli"],
   "name": "warpdive",
-  "version": "0.0.1",
-  "description": "Main package for Warpdive",
+  "repository": "github:gvkhna/warpdive",
+  "version": "${VERSION}",
   "bin": {
     "warpdive": "bin/cli"
   },
   "scripts": {
     "postinstall": "node ./install.js"
   },
   "optionalDependencies": {
-    "warpdive-darwin-amd64": "0.0.1",
-    "warpdive-darwin-arm64": "0.0.1",
-    "warpdive-linux-amd64": "0.0.1",
-    "warpdive-linux-arm64": "0.0.1",
-    "warpdive-windows-amd64": "0.0.1",
-    "warpdive-windows-arm64": "0.0.1"
-  },
-  "keywords": ["warpdive", "cli"],
-  "author": "Gaurav Khanna"
+    "warpdive-darwin-amd64": "${VERSION}",
+    "warpdive-darwin-arm64": "${VERSION}",
+    "warpdive-linux-amd64": "${VERSION}",
+    "warpdive-linux-arm64": "${VERSION}",
+    "warpdive-windows-amd64": "${VERSION}",
+    "warpdive-windows-arm64": "${VERSION}"
+  }
 }
 EOF