From 2a43121d43468f7bfb6cd0bbf9fb583a5d6b020c Mon Sep 17 00:00:00 2001 From: Jason Frey <fryguy9@gmail.com> Date: Mon, 18 Sep 2023 12:59:27 -0400 Subject: [PATCH] Remove yarn1 hack now that yarn4 works on s390x --- lib/manageiq/rpm_build/generate_core.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/manageiq/rpm_build/generate_core.rb b/lib/manageiq/rpm_build/generate_core.rb index d00a94a9..b90b553d 100644 --- a/lib/manageiq/rpm_build/generate_core.rb +++ b/lib/manageiq/rpm_build/generate_core.rb @@ -56,15 +56,10 @@ def build_service_ui symlink_plugin_paths("manageiq-ui-service", ui_service_dir) Dir.chdir(ui_service_dir) do - shell_cmd("yarn set version 1.22.18") if RUBY_PLATFORM.include?("s390x") - shell_cmd("yarn install") # Add --immutable once s390x is off of yarn 1. + shell_cmd("yarn install") # TODO: Add --immutable once s390x doesn't change the checksums. shell_cmd("yarn run available-languages") shell_cmd("yarn run build") - shell_cmd("git clean -xdf") # cleanup temp files - if RUBY_PLATFORM.include?("s390x") - shell_cmd("git checkout .yarn*") - shell_cmd("yarn set version 1.22.18") - end + shell_cmd("git clean -xdf") # cleanup temp files end end