From c9298235c4ad3001a62c5c67118426bf8e8251fd Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 16:49:34 +0200 Subject: [PATCH 1/7] install standard-version --- bump.sh | 2 +- scripts/bump-candidate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bump.sh b/bump.sh index 750d452da496d..2e3c877f030f7 100755 --- a/bump.sh +++ b/bump.sh @@ -13,4 +13,4 @@ # # -------------------------------------------------------------------------------------------------- set -euo pipefail -./scripts/bump.js ${1:-minor} +npm install standard-version && ./scripts/bump.js ${1:-minor} diff --git a/scripts/bump-candidate.sh b/scripts/bump-candidate.sh index ee509daa78d16..3e6aee1fb4e9a 100755 --- a/scripts/bump-candidate.sh +++ b/scripts/bump-candidate.sh @@ -17,4 +17,4 @@ # -------------------------------------------------------------------------------------------------- set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) -BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} +npm install standard-version && BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} From 70f51e4d97a4a9ca016e4404429cb4f48cd5f921 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 17:20:47 +0200 Subject: [PATCH 2/7] use yarn --- bump.sh | 2 +- scripts/bump-candidate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bump.sh b/bump.sh index 2e3c877f030f7..83abea55872e1 100755 --- a/bump.sh +++ b/bump.sh @@ -13,4 +13,4 @@ # # -------------------------------------------------------------------------------------------------- set -euo pipefail -npm install standard-version && ./scripts/bump.js ${1:-minor} +yarn standard-version && ./scripts/bump.js ${1:-minor} diff --git a/scripts/bump-candidate.sh b/scripts/bump-candidate.sh index 3e6aee1fb4e9a..020a07cc39e7c 100755 --- a/scripts/bump-candidate.sh +++ b/scripts/bump-candidate.sh @@ -17,4 +17,4 @@ # -------------------------------------------------------------------------------------------------- set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) -npm install standard-version && BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} +yarn standard-version && BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} From 1c9c3a5702bca904873877d97448c0d9da8bacbf Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 17:23:42 +0200 Subject: [PATCH 3/7] fix directory --- bump.sh | 4 +++- scripts/bump-candidate.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bump.sh b/bump.sh index 83abea55872e1..90960df6fd0dd 100755 --- a/bump.sh +++ b/bump.sh @@ -13,4 +13,6 @@ # # -------------------------------------------------------------------------------------------------- set -euo pipefail -yarn standard-version && ./scripts/bump.js ${1:-minor} +scriptdir=$(cd $(dirname $0) && pwd) +(cd ${scriptdir} yarn standard-version) +./scripts/bump.js ${1:-minor} diff --git a/scripts/bump-candidate.sh b/scripts/bump-candidate.sh index 020a07cc39e7c..e7024c4a54c60 100755 --- a/scripts/bump-candidate.sh +++ b/scripts/bump-candidate.sh @@ -17,4 +17,6 @@ # -------------------------------------------------------------------------------------------------- set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) -yarn standard-version && BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} +rootdir=${scriptdir}/.. +(cd ${rootdir} yarn standard-version) +BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} From c6049a8b8ad13426eb0a07b702e4d65b1f601f86 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 17:25:43 +0200 Subject: [PATCH 4/7] full path --- bump.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump.sh b/bump.sh index 90960df6fd0dd..c2c787f5b6302 100755 --- a/bump.sh +++ b/bump.sh @@ -15,4 +15,4 @@ set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) (cd ${scriptdir} yarn standard-version) -./scripts/bump.js ${1:-minor} +${scriptdir}/scripts/bump.js ${1:-minor} From 3e9a28ea6977b2475a14a1c7520fe63c59f62284 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 17:29:24 +0200 Subject: [PATCH 5/7] run yarn --- bump.sh | 2 +- scripts/bump-candidate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bump.sh b/bump.sh index c2c787f5b6302..12d8351d5f7e5 100755 --- a/bump.sh +++ b/bump.sh @@ -14,5 +14,5 @@ # -------------------------------------------------------------------------------------------------- set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) -(cd ${scriptdir} yarn standard-version) +(cd ${scriptdir} yarn) ${scriptdir}/scripts/bump.js ${1:-minor} diff --git a/scripts/bump-candidate.sh b/scripts/bump-candidate.sh index e7024c4a54c60..f64b08a176a59 100755 --- a/scripts/bump-candidate.sh +++ b/scripts/bump-candidate.sh @@ -18,5 +18,5 @@ set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) rootdir=${scriptdir}/.. -(cd ${rootdir} yarn standard-version) +(cd ${rootdir} yarn) BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} From ca1b0ec8c56c7c3821d4c4a1b00bcbe3abd9a721 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 17:32:34 +0200 Subject: [PATCH 6/7] more fancy stuff --- scripts/bump-candidate.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/bump-candidate.sh b/scripts/bump-candidate.sh index f64b08a176a59..abdbbe8a3f3a3 100755 --- a/scripts/bump-candidate.sh +++ b/scripts/bump-candidate.sh @@ -18,5 +18,4 @@ set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) rootdir=${scriptdir}/.. -(cd ${rootdir} yarn) -BUMP_CANDIDATE=true ${scriptdir}/bump.js ${1:-minor} +BUMP_CANDIDATE=true ${rootdir}/bump.sh ${1:-minor} From e250210472675116b0948ac75f215ad15abdb431 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 5 Nov 2020 17:34:43 +0200 Subject: [PATCH 7/7] less fancy --- bump.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bump.sh b/bump.sh index 12d8351d5f7e5..746353925c60d 100755 --- a/bump.sh +++ b/bump.sh @@ -14,5 +14,6 @@ # -------------------------------------------------------------------------------------------------- set -euo pipefail scriptdir=$(cd $(dirname $0) && pwd) -(cd ${scriptdir} yarn) +cd ${scriptdir} +yarn ${scriptdir}/scripts/bump.js ${1:-minor}