simplify @ruby_install2

pmq20 · Sep 20, 2020 · 222061d · 222061d
1 parent 220e44b
commit 222061d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -46,7 +46,7 @@ jobs:
           tag_name: linux-x64
           release_name: Latest Linux Pre-release
           draft: false
-          prerelease: false
+          prerelease: true
           replace_old_tag: true
       - name: "[Enclose.IO] Upload Linux Release"
         if: ${{ github.ref == 'refs/heads/master' && success() }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -46,7 +46,7 @@ jobs:
           tag_name: darwin-x64
           release_name: Latest macOS Pre-release
           draft: false
-          prerelease: false
+          prerelease: true
           replace_old_tag: true
       - name: "[Enclose.IO] Upload macOS Release"
         if: ${{ github.ref == 'refs/heads/master' && success() }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -67,7 +67,7 @@ jobs:
           tag_name: windows-x64
           release_name: Latest Windows Pre-release
           draft: false
-          prerelease: false
+          prerelease: true
           replace_old_tag: true
       - name: "[Enclose.IO] Upload Windows Release"
         if: ${{ github.ref == 'refs/heads/master' && success() }}

diff --git a/lib/compiler.rb b/lib/compiler.rb
@@ -133,7 +133,6 @@ def initialize(entrance, options = {})
     @work_dir_dummy = File.join(@options[:tmpdir], 'rubyc_work_dir_dummy')
     @work_dir_dummy_squashfs = File.join(@options[:tmpdir], 'dummy.squashfs')
     @build_pass2 = File.join(@options[:tmpdir], 'build_pass2')
-    @ruby_install2 = File.join(@options[:tmpdir], 'ruby_install2')
   end
 
   def init_entrance(entrance)
@@ -201,6 +200,7 @@ def run!
     patch_win32_makefile_sub if Gem.win_platform?
     prepare_work_dir_dummy_squashfs unless File.exist?(@work_dir_dummy_squashfs)
     build_pass1 unless Dir.exist?(@ruby_install)
+
     prepare_work_dir unless Dir.exist?(@work_dir)
     ext_setup
     prepare_work_dir_squashfs unless File.exist?(@work_dir_squashfs)
@@ -357,7 +357,6 @@ def build_pass2_unix
       @utils.run(compile_pass2_env,
                  @ruby_configure,
                  '-C',
-                 '--prefix', @ruby_install2,
                  "--with-baseruby=#{File.join(@ruby_install_bin, 'ruby')}",
                  '--enable-bundled-libyaml',
                  '--without-gmp',
@@ -379,7 +378,6 @@ def build_pass2_windows
       @utils.run(compile_pass2_env,
                  'call', @ruby_configure,
                  '--target=x64-mswin64',
-                 "--prefix=#{@ruby_install2}",
                  '--enable-bundled-libyaml',\
                  '--enable-debug-env',
                  '--disable-install-doc',