From 9c78302bf13647a0430e362ebe382488d1d736e7 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Wed, 20 Sep 2023 16:49:01 -0400 Subject: [PATCH] Drop s390x hack now that we are on yarn 4 --- scripts/npm_registry/yarn_registry_cleanup.sh | 8 +------- scripts/npm_registry/yarn_registry_setup.sh | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/npm_registry/yarn_registry_cleanup.sh b/scripts/npm_registry/yarn_registry_cleanup.sh index a1e31217..f6c627d0 100755 --- 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 index 3f0ecb5e..0cd9cd84 100755 --- 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`