Merge pull request #20 from kogeletey/main

Support env variables in script update zola to next version
U-C-S · Feb 25, 2023 · dfe0c88 · dfe0c88
2 parents cdb5b00 + e889c41
commit dfe0c88
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 46 deletions.
diff --git a/packages/create-zola-site/package.json b/packages/create-zola-site/package.json
@@ -20,7 +20,7 @@
 		"yargs": "^17.6.2"
 	},
 	"devDependencies": {
-		"zola-bin": "^0.3.5"
+		"zola-bin": "^0.3.6"
 	},
 	"engines": {
 		"node": ">=14.0.0"

diff --git a/packages/zola-bin-darwin/package.json b/packages/zola-bin-darwin/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "zola-bin-darwin",
-  "version": "0.16.2",
-  "description": "The binary file of Zola",
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/U-C-S/zola-tools",
-    "directory": "packages/zola-bin-darwin"
-  },
-  "os": [
-    "darwin"
-  ],
-  "license": "MIT"
+	"name": "zola-bin-darwin",
+	"version": "0.17.0",
+	"description": "The binary file of Zola",
+	"type": "module",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/U-C-S/zola-tools",
+		"directory": "packages/zola-bin-darwin"
+	},
+	"os": [
+		"darwin"
+	],
+	"license": "MIT"
 }
diff --git a/packages/zola-bin-linux/package.json b/packages/zola-bin-linux/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "zola-bin-linux",
-  "version": "0.16.2",
-  "description": "The binary file of Zola",
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/U-C-S/zola-tools",
-    "directory": "packages/zola-bin-linux"
-  },
-  "os": [
-    "linux"
-  ],
-  "license": "MIT"
+	"name": "zola-bin-linux",
+	"version": "0.17.0",
+	"description": "The binary file of Zola",
+	"type": "module",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/U-C-S/zola-tools",
+		"directory": "packages/zola-bin-linux"
+	},
+	"os": [
+		"linux"
+	],
+	"license": "MIT"
 }
diff --git a/packages/zola-bin-win32/package.json b/packages/zola-bin-win32/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "zola-bin-win32",
-  "version": "0.16.2",
-  "description": "The binary file of Zola",
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/U-C-S/zola-tools",
-    "directory": "packages/zola-bin-win32"
-  },
-  "os": [
-    "win32"
-  ],
-  "license": "MIT"
+	"name": "zola-bin-win32",
+	"version": "0.17.0",
+	"description": "The binary file of Zola",
+	"type": "module",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/U-C-S/zola-tools",
+		"directory": "packages/zola-bin-win32"
+	},
+	"os": [
+		"win32"
+	],
+	"license": "MIT"
 }
diff --git a/packages/zola-bin/bin/zola.js b/packages/zola-bin/bin/zola.js
diff --git a/packages/zola-bin/package.json b/packages/zola-bin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "zola-bin",
-	"version": "0.3.5",
+	"version": "0.3.6",
 	"author": "U-C-S",
 	"license": "MIT",
 	"description": "Zola, A Static Site Generator, as a NPM Package",
@@ -27,9 +27,9 @@
 		"dotenv": "16.0.3"
 	},
 	"optionalDependencies": {
-		"zola-bin-darwin": "^0.16.2",
-		"zola-bin-linux": "^0.16.2",
-		"zola-bin-win32": "^0.16.2"
+		"zola-bin-darwin": "^0.17.0",
+		"zola-bin-linux": "^0.17.0",
+		"zola-bin-win32": "^0.17.0"
 	},
 	"devDependencies": {
 		"typescript": "^4.9.4"

diff --git a/scripts/getzola.js b/scripts/getzola.js
@@ -5,7 +5,7 @@ import { Octokit } from "@octokit/rest";
 import extract from "extract-zip";
 import tar from "tar";
 
-const ZOLA_VERSION = fs.readFileSync("./zola-version.txt", "utf8"); // TODO: support a env variable for zola version for CI/CD
+const ZOLA_VERSION = process.env.ZOLA_VERSION ? process.env.ZOLA_VERSION : fs.readFileSync("./zola-version.txt", "utf8");
 const downloadCacheDir = "./.cache/zola_bin";
 
 console.log(`Downloading Zola ${ZOLA_VERSION}...`);

diff --git a/zola-version.txt b/zola-version.txt
@@ -1 +1 @@
-v0.16.1
+v0.17.0