From 81b68462614a1c54a2cdc26762b23e8d3975abfe Mon Sep 17 00:00:00 2001 From: mattmcw Date: Sat, 25 Feb 2023 22:22:18 -0500 Subject: [PATCH] Only update patch on main --- app/data/cfg.json | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- scripts/pre_commit.sh | 8 +++++++- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index 4c40dac..2a62269 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.7.18", + "version": "1.7.19", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index 16b8979..4c6090d 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.7.18", + "version": "1.7.19", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index c93f6b5..df9f997 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.7.18", + "version": "1.7.19", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/data/cfg.json b/data/cfg.json index 4c40dac..2a62269 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.7.18", + "version": "1.7.19", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index c3e3644..92dd87b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.7.18", + "version": "1.7.19", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.7.18", + "version": "1.7.19", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index ff58382..e7d955f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.7.18", + "version": "1.7.19", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 4c40dac..2a62269 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.7.18", + "version": "1.7.19", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/scripts/pre_commit.sh b/scripts/pre_commit.sh index 401bd33..ca59f8f 100644 --- a/scripts/pre_commit.sh +++ b/scripts/pre_commit.sh @@ -1,3 +1,9 @@ #!/bin/bash -npm run patch \ No newline at end of file +branch_name=`sh ./scripts/branch_name.sh` + +if [[ "${branch_name}" == "main" ]]; then + npm run patch +else + echo "no pre-commit on branch ${branch_name}" +fi \ No newline at end of file