From e6a48c8799592fc88ea4669f7e133a8074e8e061 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sat, 6 Aug 2022 15:15:36 +0100 Subject: [PATCH] fix CI --- .docs/package.json | 6 ++---- build.sh | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.docs/package.json b/.docs/package.json index 3ccf4ce..b8084d1 100644 --- a/.docs/package.json +++ b/.docs/package.json @@ -19,7 +19,7 @@ "url": "https://github.com/sbrl/Minetest-WorldEditAdditions/issues" }, "homepage": "https://github.com/sbrl/Minetest-WorldEditAdditions#readme", - "devDependencies": { + "dependencies": { "@11ty/eleventy": "^1.0.1", "chroma-js": "^2.4.2", "columnify": "^1.6.0", @@ -29,9 +29,7 @@ "p-memoize": "^7.1.0", "p-queue": "^7.3.0", "phin": "^3.6.1", - "pretty-ms": "^7.0.1" - }, - "dependencies": { + "pretty-ms": "^7.0.1", "clean-css": "^5.3.1", "html-entities": "^2.3.3", "html-minifier-terser": "^7.0.0-beta.0" diff --git a/build.sh b/build.sh index a0ea04f..ef26942 100755 --- a/build.sh +++ b/build.sh @@ -8,9 +8,6 @@ if [[ "${1}" == "ci" ]] && [[ ! -z "${is_main}" ]]; then echo "Skipping build, because this commit does not appear to be on the 'main' branch, and we only deploy commits on the 'main' branch."; fi -# This causes the eleventy docs site to minify stuff -export NODE_ENV=production; - # ██████ ██ ██████ ██ ██ ██ ██ ██████ # ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ # ██ ██ ██████ ██ ██ ██ ██ ██ ██ @@ -94,6 +91,9 @@ npm install; log_msg "Building website"; +# This causes the eleventy docs site to minify stuff +# Note that this is NOT before the npm install, as npm doesn't install everything if we do that +export NODE_ENV=production; npm run build; if [[ ! -d "_site" ]]; then