v2.6.0

tkhamez · Nov 1, 2024 · 632fafc · 632fafc
1 parent a39fab9
commit 632fafc
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-# next
+# 2.6.0
 
-dd mm yyyy
+01 Nov 2024
 
 - Added password login as an alternative to EVE SSO.
 - Fixed a bug where a group was incorrectly removed automatically (if it had a forbidden group that 

diff --git a/backend/config/version.php b/backend/config/version.php
@@ -2,4 +2,4 @@
 
 // Note: rebuild the fronted when changed because the version is included in the generated JS API client.
 
-const NEUCORE_VERSION = '2.6.0-dev';
+const NEUCORE_VERSION = '2.6.0';
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/setup/install-docker.sh b/setup/install-docker.sh
@@ -17,8 +17,8 @@ docker compose run neucore_java /app/frontend/openapi.sh
 docker compose exec neucore_node npm install --prefix /app/frontend/neucore-js-client
 docker compose exec neucore_node npm run build --prefix /app/frontend/neucore-js-client
 
-
 # Build frontend
+docker compose exec neucore_node npm i file:neucore-js-client
 docker compose exec neucore_node npm ci
 if [[ $1 = prod ]]; then
     docker compose exec neucore_node npm run build

diff --git a/setup/install.sh b/setup/install.sh
@@ -19,7 +19,9 @@ npm install
 npm run build
 
 # Build frontend
-cd "${DIR}"/../frontend && npm ci
+cd "${DIR}"/../frontend || exit
+npm i file:neucore-js-client
+npm ci
 if [[ $1 = prod ]]; then
     npm run build
 fi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		// Note: rebuild the fronted when changed because the version is included in the generated JS API client.

		const NEUCORE_VERSION = '2.6.0-dev';
		const NEUCORE_VERSION = '2.6.0';