Merge pull request #407 from bdunne/npm_manageiq_org

Registry is set differently for diffrent yarn versions
ManageIQ · Jul 27, 2023 · 9506eed · 9506eed
2 parents c0bf878 + ec183f8
commit 9506eed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/scripts/npm_registry/yarn_registry_cleanup.sh b/scripts/npm_registry/yarn_registry_cleanup.sh
@@ -2,8 +2,12 @@
 
 NPM_REGISTRY_OVERRIDE="$1"
 
-yarn config delete npmRegistryServer
-yarn config delete enableStrictSsl
+if [[ $(uname -m) == "s390x" ]]; then
+  # For yarn v1
+  yarn config delete registry
+else
+  yarn config delete npmRegistryServer
+fi
 
 # Replace registry in yarn.lock
 default_yarn_registry=`yarn config get npmRegistryServer`

diff --git a/scripts/npm_registry/yarn_registry_setup.sh b/scripts/npm_registry/yarn_registry_setup.sh
@@ -2,8 +2,12 @@
 
 NPM_REGISTRY_OVERRIDE="$1"
 
-yarn config set npmRegistryServer ${NPM_REGISTRY_OVERRIDE}
-yarn config set enableStrictSsl false
+if [[ $(uname -m) == "s390x" ]]; then
+  # For yarn v1
+  yarn config set registry ${NPM_REGISTRY_OVERRIDE}
+else
+  yarn config set npmRegistryServer ${NPM_REGISTRY_OVERRIDE}
+fi
 
 # Replace registry in existing yarn.lock
 ui_plugin_repos=`rake update:print_engines | grep path: | cut -d: -f2`