diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77219767f..2f8135a42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,10 @@ jobs: - name: workaround signature issue on github actions shell: cmd - run: C:\msys64\usr\bin\sed -i "/^SigLevel/ s/$/ DatabaseOptional/" /etc/pacman.conf + run: | + C:\msys64\usr\bin\sed -i "s/^SigLevel.*$/SigLevel = Never/" /etc/pacman.conf + C:\msys64\usr\bin\sed -i "s/^LocalFileSigLevel/#LocalFileSigLevel/" /etc/pacman.conf + C:\msys64\usr\bin\sed -i "s/^RemoteFileSigLevel/#RemoteFileSigLevel/" /etc/pacman.conf - name: Kill all running msys2 binaries to avoid error "size of shared memory region changed". shell: powershell @@ -207,7 +210,7 @@ jobs: shell: cmd env: GPGPASSWD: ${{ secrets.GPGPASSWD }} - DEPLOY_REPO_NAME: oneclick/rubyinstaller2 + DEPLOY_REPO_NAME: Vishal1309/rubyinstaller2 DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }} run: | call ridk enable diff --git a/recipes/sandbox/70-move-openssl-files-to-bin.rake b/recipes/sandbox/70-move-openssl-files-to-bin.rake index 125ac2325..054249e2b 100644 --- a/recipes/sandbox/70-move-openssl-files-to-bin.rake +++ b/recipes/sandbox/70-move-openssl-files-to-bin.rake @@ -3,9 +3,6 @@ if package.rubyver2 >= "3.2" osl_files = %w[ - lib/engines-3/capi.dll - lib/engines-3/loader_attic.dll - lib/engines-3/padlock.dll lib/ossl-modules/legacy.dll ] diff --git a/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files b/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files index 12f6a3b7b..173995736 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files @@ -1,5 +1,3 @@ -bin/libcrypto-3-x64.dll bin/libgcc_s_seh-1.dll -bin/libssl-3-x64.dll bin/x64-msvcrt-ruby320.dll lib/libx64-msvcrt-ruby320.dll.a diff --git a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files index 5cbc322fc..355cd4a79 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files @@ -1,5 +1,4 @@ -bin/libcrypto-3-x64.dll bin/libgcc_s_seh-1.dll -bin/libssl-3-x64.dll bin/x64-ucrt-ruby320.dll lib/libx64-ucrt-ruby320.dll.a + diff --git a/recipes/unpack/30-add-ri2-repo-to-msys.rake b/recipes/unpack/30-add-ri2-repo-to-msys.rake index cc3b37f73..0f1f7cab2 100644 --- a/recipes/unpack/30-add-ri2-repo-to-msys.rake +++ b/recipes/unpack/30-add-ri2-repo-to-msys.rake @@ -3,16 +3,16 @@ file self.repo_added => [File.dirname(self.repo_added)] do |t| msys_path = RubyInstaller::Build.msys2_installation.msys_path pacman_conf = File.join(msys_path, "/etc/pacman.conf") - if File.read(pacman_conf) =~ /^\[ci\.ri2\]/ - $stderr.puts "pacman repo 'ci.ri2' is already registered" + if File.read(pacman_conf) =~ /^\[test_tag\]/ + $stderr.puts "pacman repo 'test_tag' is already registered" else - $stderr.puts "Register pacman repo 'ci.ri2'" + $stderr.puts "Register pacman repo 'test_tag'" File.open(pacman_conf, "a+") do |fd| fd.puts fd.puts "# Added for RubyInstaller2 packaging by #{__FILE__}" fd.puts <<-EOT -[ci.ri2] -Server = https://github.com/oneclick/rubyinstaller2-packages/releases/download/ci.ri2 +[test_tag] +Server = https://github.com/Vishal1309/rubyinstaller2-packages/releases/download/test_tag EOT end $stderr.puts "Populated #{ pacman_conf }:\n#{ File.read(pacman_conf) }" diff --git a/test/test_stdlib.rb b/test/test_stdlib.rb index 22af2b550..d06e99be3 100644 --- a/test/test_stdlib.rb +++ b/test/test_stdlib.rb @@ -75,6 +75,7 @@ def test_openssl_version else assert_match(/OpenSSL 3\./, OpenSSL::OPENSSL_VERSION) assert_match(/OpenSSL 3\./, OpenSSL::OPENSSL_LIBRARY_VERSION) + assert_match(/OpenSSL 3\./, OpenSSL::OPENSSL_LIBRARY_VERSION) end end