Merge pull request #420 from Fryguy/drop_s390x_hack

Drop s390x hack now that we are on yarn 4
ManageIQ · Sep 21, 2023 · b257a01 · b257a01
2 parents 21d29d7 + 9c78302
commit b257a01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/scripts/npm_registry/yarn_registry_cleanup.sh b/scripts/npm_registry/yarn_registry_cleanup.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
 NPM_REGISTRY_OVERRIDE="$1"
-
-if [[ $(uname -m) == "s390x" ]]; then
-  # For yarn v1
-  yarn config delete registry
-else
-  yarn config delete npmRegistryServer
-fi
+yarn config delete npmRegistryServer
 
 # 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
@@ -1,13 +1,7 @@
 #!/bin/bash
 
 NPM_REGISTRY_OVERRIDE="$1"
-
-if [[ $(uname -m) == "s390x" ]]; then
-  # For yarn v1
-  yarn config set registry ${NPM_REGISTRY_OVERRIDE}
-else
-  yarn config set npmRegistryServer ${NPM_REGISTRY_OVERRIDE}
-fi
+yarn config set npmRegistryServer ${NPM_REGISTRY_OVERRIDE}
 
 # Replace registry in existing yarn.lock
 ui_plugin_repos=`rake update:print_engines | grep path: | cut -d: -f2`