Skip to content

Commit e5f31a8

Browse files
committed
Workaround mv on Windows which can remove jruby.exe
1 parent d338bf7 commit e5f31a8

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,28 +160,23 @@ jobs:
160160
- run: echo "JAVA_HOME=${JAVA_HOME_21_X64:-${JAVA_HOME_21_arm64:-}}" >> "$GITHUB_ENV"
161161
shell: bash
162162

163-
- name: Set PREFIX
164-
run: echo "PREFIX=$HOME/.rubies/${{ steps.ruby.outputs.ruby }}" >> $GITHUB_ENV
165-
shell: bash
166163
- run: curl --fail -L -O 'https://repo1.maven.org/maven2/org/jruby/jruby-dist/${{ matrix.jruby-version }}/jruby-dist-${{ matrix.jruby-version }}-bin.tar.gz'
167164
shell: bash
168165
# NOTE: Keep the logic from here in sync with jruby-dev-builder's build job
169166
# Extracting must be done in the native shell: https://github.com/MSP-Greg/ruby-setup-ruby/issues/1
170167
# We need to use to use the system tar, the Git tar seems basically broken
168+
# And `mv dir /c/...` also removes jruby.exe, so we need to avoid that.
171169
- run: C:\windows\system32\tar.exe xf jruby-dist-${{ matrix.jruby-version }}-bin.tar.gz
172-
- name: Move to prefix
170+
- name: Check bin/
173171
shell: bash
174-
run: |
175-
mkdir $(dirname $PREFIX)
176-
ls -l jruby-${{ matrix.jruby-version }}/bin
177-
mv jruby-${{ matrix.jruby-version }} $(dirname $PREFIX)
178-
ls -l $PREFIX/bin
172+
run: ls -l jruby-${{ matrix.jruby-version }}/bin
179173
- name: Create archive
180-
run: tar czf ${{ steps.ruby.outputs.archive }} -C $(dirname $PREFIX) $(basename $PREFIX)
181-
shell: bash
174+
run: tar czf ${{ steps.ruby.outputs.archive }} jruby-${{ matrix.jruby-version }}
175+
# End of shared logic with jruby-dev-builder
182176
- name: Install Bundler if needed
183177
shell: bash
184178
run: |
179+
export "PREFIX=$PWD/jruby-${{ matrix.jruby-version }}"
185180
if [ ! -e $PREFIX/bin/bundle ]; then
186181
export PATH="$PREFIX/bin:$PATH"
187182
gem install bundler -v '~> 1' --no-document

0 commit comments

Comments
 (0)