From 619a6b90820d9b2453673dc75819e91ac0829d5f Mon Sep 17 00:00:00 2001 From: ezeswci Date: Wed, 25 Aug 2021 12:27:52 +1000 Subject: [PATCH 1/6] Dont reset git head --- scripts/update-submodules.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/update-submodules.sh b/scripts/update-submodules.sh index 31290161..ed23df59 100755 --- a/scripts/update-submodules.sh +++ b/scripts/update-submodules.sh @@ -12,8 +12,6 @@ function updateSubmodules { exit 1 fi - git submodule foreach --recursive git clean -fdx - git submodule foreach --recursive git reset --hard HEAD git submodule sync --recursive git submodule update --init --recursive git config url."https://github.com/".insteadOf git@github.com: From 92d5b57b73b2242a69bacd5d2c12908c302c3128 Mon Sep 17 00:00:00 2001 From: ezeswci Date: Wed, 25 Aug 2021 16:20:00 +1000 Subject: [PATCH 2/6] Update to commit before expresss changes --- bfx-report-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bfx-report-ui b/bfx-report-ui index 850d290d..9a6536f9 160000 --- a/bfx-report-ui +++ b/bfx-report-ui @@ -1 +1 @@ -Subproject commit 850d290db205b7bc3849cfeb5dab1ff7b856a3c7 +Subproject commit 9a6536f97e75e363379560f930d4dec5c73f77fa From abbb1bfc38163406d23b9b6c451c8ff397dd340b Mon Sep 17 00:00:00 2001 From: ezeswci Date: Wed, 25 Aug 2021 16:50:09 +1000 Subject: [PATCH 3/6] Remove sub module update --- scripts/update-submodules.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/update-submodules.sh b/scripts/update-submodules.sh index ed23df59..4bc3fb2b 100755 --- a/scripts/update-submodules.sh +++ b/scripts/update-submodules.sh @@ -13,10 +13,8 @@ function updateSubmodules { fi git submodule sync --recursive - git submodule update --init --recursive git config url."https://github.com/".insteadOf git@github.com: git pull --recurse-submodules - git submodule update --remote --recursive if [ $branch != "master" ] then From e2a7ca5b0df18af3d6af6639bd8ef5fcc3616c7b Mon Sep 17 00:00:00 2001 From: ezeswci Date: Wed, 25 Aug 2021 17:13:49 +1000 Subject: [PATCH 4/6] update the submodules --- scripts/update-submodules.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/update-submodules.sh b/scripts/update-submodules.sh index 4bc3fb2b..679fe350 100755 --- a/scripts/update-submodules.sh +++ b/scripts/update-submodules.sh @@ -13,7 +13,9 @@ function updateSubmodules { fi git submodule sync --recursive + git submodule update --recursive git config url."https://github.com/".insteadOf git@github.com: + git submodule update --recursive git pull --recurse-submodules if [ $branch != "master" ] From a653dab551df60469d5a35784ff8fa3956293e2f Mon Sep 17 00:00:00 2001 From: ezeswci Date: Thu, 26 Aug 2021 19:59:38 +1000 Subject: [PATCH 5/6] Update sub modules --- bfx-report-ui | 2 +- bfx-reports-framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bfx-report-ui b/bfx-report-ui index 9a6536f9..4c2239ec 160000 --- a/bfx-report-ui +++ b/bfx-report-ui @@ -1 +1 @@ -Subproject commit 9a6536f97e75e363379560f930d4dec5c73f77fa +Subproject commit 4c2239ecbdbf13375c049af1d790e184730ba412 diff --git a/bfx-reports-framework b/bfx-reports-framework index 9892eff8..7252e7ae 160000 --- a/bfx-reports-framework +++ b/bfx-reports-framework @@ -1 +1 @@ -Subproject commit 9892eff858db39dd2ef53e545acd9b3313ebb1d9 +Subproject commit 7252e7aeea7e2675033300aab6b1e3dca25ce414 From ab10be44c9ee1a02d40e674f25eeca22409624bb Mon Sep 17 00:00:00 2001 From: ezeswci Date: Thu, 26 Aug 2021 19:59:47 +1000 Subject: [PATCH 6/6] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 232b32cd..451d26f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bfx-report-electron", - "version": "3.5.3", + "version": "3.5.4", "repository": "https://github.com/bitfinexcom/bfx-report-electron", "description": "Reporting tool", "author": "bitfinex.com",