precommit version adjustments

README.md

@@ -22,7 +22,7 @@ After performing these steps, the next time you open CCM2, you will see your col
 ### Contribute
 The project includes configuration for [VSCode development containers](https://code.visualstudio.com/docs/remote/containers) which should be the preffered environment to develop new features of the app. The container automatically sets up a whole Tauri development environment including Typescript & Rust plugins for VSCode.
 
-Also, in directory `hooks/` you find some helpful git hooks that automate/standardize some work. You can activate these hooks by executing the script `activate_hooks.sh` from within the `hooks/` directory. If you are receiving errors like `fatal: cannot run .git/hooks/pre-commit: No such file or directory`, check the line-end sequence of the hook scripts, adjust them according to your system and run `activate_hooks.sh` again. 
+Also, in directory `hooks/` you find some helpful git hooks that automate/standardize some work. You can activate these hooks by executing the script `activate_hooks.sh` from within the `hooks/` directory. If you are receiving errors like `fatal: cannot run .git/hooks/pre-commit: No such file or directory`, check the line-end sequence of the hook scripts, adjust them according to your system and run `activate_hooks.sh` again. The hooks are especially useful for versioning. They ensure that the version number in each of the 3 manifest files are the same and create a `version` file with the current version at the project's root level, which can be picked up easily by automated CI/CD tasks.
 
 Additionally, if you want to run the GUI out of the container, you need to use a X11 tool. I will briefly explain how to run them in order to display the GUI from the container:
 

card-collection-manager-2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "card-collection-manager-2",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "scripts": {
     "dev": "next dev -p 1420",
     "build": "next build && next export -o dist",

card-collection-manager-2/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "card-collection-manager-2"
-version = "1.0.1"
+version = "1.0.2"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

card-collection-manager-2/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "card-collection-manager-2",
-    "version": "1.0.1"
+    "version": "1.0.2"
   },
   "tauri": {
     "allowlist": {

card-collection-manager-2/version

@@ -1 +0,0 @@
-1.0.1

hooks/pre-commit

@@ -1,26 +1,29 @@
 #!/bin/sh
 PROJECT_ROOT=$(pwd)
 
-# check if version and project name are the same in frontend and backend manifest
+# Check if version and project name are the same in all manifest files.
+# TAURI_VERSION is the version that is actually used by the tauri build command,
+# but to avoid any misconception, versions in all manifests should be the same.
 cd $PROJECT_ROOT && cd card-collection-manager-2/src-tauri
 CARGO_VERSION=$(cargo read-manifest | jq -r .version)
 CARGO_NAME=$(cargo read-manifest | jq -r .name)
+TAURI_VERSION=$(cat tauri.conf.json | jq -r .package.version)
+TAURI_NAME=$(cat tauri.conf.json | jq -r .package.productName)
 cd $PROJECT_ROOT && cd card-collection-manager-2
 YARN_VERSION=$(cat package.json | jq -r .version)
 YARN_NAME=$(cat package.json | jq -r .name)
 
-if [ $CARGO_VERSION != $YARN_VERSION ]; then
+if [ $CARGO_VERSION != $YARN_VERSION ] || [ $CARGO_VERSION != $TAURI_VERSION ] || [ $YARN_VERSION != $TAURI_VERSION ]; then
-    echo "[PRE-COMMIT] Project version in 'package.json' and 'Cargo.toml' does not match."
+    echo "[PRE-COMMIT] Project version in manifests does not match."
     exit 1
 fi
-if [ $CARGO_NAME != $YARN_NAME ]; then
+if [ $CARGO_NAME != $YARN_NAME ] || [ $CARGO_NAME != $TAURI_NAME ] || [ $YARN_NAME != $TAURI_NAME ]; then
-    echo "[PRE-COMMIT] Project name in 'package.json' and 'Cargo.toml' does not match."
+    echo "[PRE-COMMIT] Project name in manifests does not match."
     exit 1
 fi
 
-
 cd $PROJECT_ROOT
-echo $CARGO_VERSION > version
+echo $TAURI_VERSION > version
 git add version
 
 exit 0

version

@@ -1 +1 @@
-1.0.1
+1.0.2