From c39833a5913cd4c8fe24119c8ee5b21af9f2cb86 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Mon, 21 Jul 2025 14:24:10 -0500 Subject: [PATCH] Don't manipulate bin scripts for jruby/ruby In jruby/jruby#8875 we modified JRuby's distribution to always ship scripts for bin/jruby and bin/ruby: * bin/jruby and bin/ruby are versioned shell scripts that launch `/bin/sh bin/jruby.sh`. * bin/ruby.bat contains batch code to launch bin/ruby.exe. * No copying of scripts is done during the build and no tweaks are needed by installers to copy, link, or create additional bin/ commands. These changes now conflict with jruby-dev-builder's symlinking of bin/jruby to bin/ruby and its creation of bin/ruby.bat, so we remove the relevant steps. --- .github/workflows/build.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ce93ea..9e2936d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,21 +115,6 @@ jobs: ls -l jruby-*-SNAPSHOT/bin mv jruby-*-SNAPSHOT jruby-head ls -l jruby-head/bin - - name: Add ruby alias - if: "!startsWith(matrix.os, 'windows')" - run: | - cd jruby-head/bin - ln -s jruby ruby - - name: Add ruby alias (Windows) - if: startsWith(matrix.os, 'windows') - shell: bash - run: | - cd jruby-head/bin - # Copy bash launcher, so 'ruby' works in bash - cp jruby ruby - # Create ruby.bat, so 'ruby' works in pwsh - echo -en "@ECHO OFF\r\n@\"%~dp0jruby.exe\" %*\r\n" > ruby.bat - ls -l - name: Create archive run: tar czf jruby-head-${{ steps.platform.outputs.platform }}.tar.gz jruby-head