From 18a0061f11a5c33cb421a662c9335de6d530ee38 Mon Sep 17 00:00:00 2001 From: Eldiiar Date: Thu, 4 Jan 2024 20:18:05 +0600 Subject: [PATCH 1/4] platform-complete stripes building issue fix addition to previous ticket: FOLIO-3768 --- vars/buildStripesPlatform.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/buildStripesPlatform.groovy b/vars/buildStripesPlatform.groovy index acf6982..f86adad 100644 --- a/vars/buildStripesPlatform.groovy +++ b/vars/buildStripesPlatform.groovy @@ -9,11 +9,11 @@ def call(String okapiUrl, String tenant, String branch='') { def foliociLib = new org.folio.foliociCommands() - if (!(branch =~ /^(r|R)\d{1}-\d{4}(-(rc|RC|hotfix-\d{1}))?$/)) { + if (!(branch =~ /^[rR]\d-\d{4}(-([rR][cC]|hotfix-\d))?/)) { sh 'rm -f yarn.lock' } - sh 'yarn install' + sh 'yarn install --frozen-lockfile' // publish generated yarn.lock for possible debugging sh 'mkdir -p ci' From 854135d56a4db89b77b8e83c6d646f478557f491 Mon Sep 17 00:00:00 2001 From: Eldiiar Date: Fri, 12 Jan 2024 18:57:54 +0600 Subject: [PATCH 2/4] adjusted according to Zak's suggestions & addition to previous ticket: FOLIO-3768 --- vars/buildStripesPlatform.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/buildStripesPlatform.groovy b/vars/buildStripesPlatform.groovy index f86adad..ac0f38e 100644 --- a/vars/buildStripesPlatform.groovy +++ b/vars/buildStripesPlatform.groovy @@ -9,7 +9,7 @@ def call(String okapiUrl, String tenant, String branch='') { def foliociLib = new org.folio.foliociCommands() - if (!(branch =~ /^[rR]\d-\d{4}(-([rR][cC]|hotfix-\d))?/)) { + if (!(branch =~ /^[rR]\d-\d{4}(-([rR][cC]|hotfix-\d))?$/ || /\bmaster\b/)) { sh 'rm -f yarn.lock' } From f70a361b16d7fa85b474a3a946451aaa33bbbc8e Mon Sep 17 00:00:00 2001 From: Eldiiar Date: Tue, 16 Jan 2024 22:22:25 +0600 Subject: [PATCH 3/4] adjusted according to Zak's suggestions & addition to previous ticket: FOLIO-3768 part2 --- vars/buildStripesPlatform.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/buildStripesPlatform.groovy b/vars/buildStripesPlatform.groovy index ac0f38e..97bfe48 100644 --- a/vars/buildStripesPlatform.groovy +++ b/vars/buildStripesPlatform.groovy @@ -9,7 +9,7 @@ def call(String okapiUrl, String tenant, String branch='') { def foliociLib = new org.folio.foliociCommands() - if (!(branch =~ /^[rR]\d-\d{4}(-([rR][cC]|hotfix-\d))?$/ || /\bmaster\b/)) { + if (!(branch =~ /^[rR]\d-\d{4}(-([rR][cC]|hotfix-\d))?$/) && !(branch =~ /\bmaster\b/)) { sh 'rm -f yarn.lock' } From b1f5f5f64e659fc893d39c2974f4c557b84b2104 Mon Sep 17 00:00:00 2001 From: Eldiiar Date: Wed, 17 Jan 2024 08:16:55 +0600 Subject: [PATCH 4/4] adjusted according to Zak's suggestions & addition to previous ticket: FOLIO-3768 part2.1 --- vars/buildStripesPlatform.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/buildStripesPlatform.groovy b/vars/buildStripesPlatform.groovy index 97bfe48..a306052 100644 --- a/vars/buildStripesPlatform.groovy +++ b/vars/buildStripesPlatform.groovy @@ -13,7 +13,7 @@ def call(String okapiUrl, String tenant, String branch='') { sh 'rm -f yarn.lock' } - sh 'yarn install --frozen-lockfile' + sh 'yarn install' // publish generated yarn.lock for possible debugging sh 'mkdir -p ci'