From 3fd1740df071741540bcdf6b04cd7363a2824003 Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Tue, 21 May 2024 18:21:48 +0530 Subject: [PATCH 01/11] test --- test/test_stdlib.rb | 1 + 1 file changed, 1 insertion(+) 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 From b0b4b330e98f262007136688c36052edcef7f0c8 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 23 May 2024 16:41:50 -0400 Subject: [PATCH 02/11] Update the location of packages used for build --- recipes/unpack/30-add-ri2-repo-to-msys.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/unpack/30-add-ri2-repo-to-msys.rake b/recipes/unpack/30-add-ri2-repo-to-msys.rake index cc3b37f73..d4ee51fbc 100644 --- a/recipes/unpack/30-add-ri2-repo-to-msys.rake +++ b/recipes/unpack/30-add-ri2-repo-to-msys.rake @@ -12,7 +12,7 @@ file self.repo_added => [File.dirname(self.repo_added)] do |t| fd.puts "# Added for RubyInstaller2 packaging by #{__FILE__}" fd.puts <<-EOT [ci.ri2] -Server = https://github.com/oneclick/rubyinstaller2-packages/releases/download/ci.ri2 +Server = https://github.com/Vishal1309/rubyinstaller2-packages/releases/download/test_tag EOT end $stderr.puts "Populated #{ pacman_conf }:\n#{ File.read(pacman_conf) }" From 635afae28768b73b07f2d529237f147c7a6e4a01 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 23 May 2024 19:09:00 -0400 Subject: [PATCH 03/11] Fix error with tag name --- recipes/unpack/30-add-ri2-repo-to-msys.rake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/unpack/30-add-ri2-repo-to-msys.rake b/recipes/unpack/30-add-ri2-repo-to-msys.rake index d4ee51fbc..0f1f7cab2 100644 --- a/recipes/unpack/30-add-ri2-repo-to-msys.rake +++ b/recipes/unpack/30-add-ri2-repo-to-msys.rake @@ -3,15 +3,15 @@ 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] +[test_tag] Server = https://github.com/Vishal1309/rubyinstaller2-packages/releases/download/test_tag EOT end From 7100e938fcf490fab55cea71e6346923c99bbc0d Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 23 May 2024 20:07:18 -0400 Subject: [PATCH 04/11] Modify need for signature file --- .github/workflows/ci.yml | 50 ++++------------------------------------ 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77219767f..795a5ce18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,56 +11,11 @@ jobs: fail-fast: false matrix: include: - - target_ruby: "3.3.1" - arch: "x86-msvcrt" - build_ruby: "3.1.5/x64" - run_mri_spec: v3_3_0 - - - target_ruby: "3.3.1" - arch: "x64-ucrt" - build_ruby: "3.1.5/x64" - run_mri_spec: v3_3_0 - - target_ruby: "3.2.4" arch: "x86-msvcrt" build_ruby: "3.1.5/x64" run_mri_spec: v3_2_2 - - target_ruby: "3.2.4" - arch: "x64-ucrt" - build_ruby: "3.1.5/x64" - run_mri_spec: v3_2_2 - - - target_ruby: "3.1.5" - arch: "x86-msvcrt" - build_ruby: "3.0.7/x64" - run_mri_spec: v3_1_4 - - - target_ruby: "3.1.5" - arch: "x64-ucrt" - build_ruby: "3.0.7/x64" - run_mri_spec: v3_1_4 - - - target_ruby: "3.0.7" - arch: "x86-msvcrt" - build_ruby: "3.1.5/x64" - run_mri_spec: v3_0_6 - - - target_ruby: "3.0.7" - arch: "x64-msvcrt" - build_ruby: "3.1.5/x64" - run_mri_spec: v3_0_6 - - - target_ruby: "head" - arch: "x64-ucrt" - build_ruby: "3.0.7/x64" - run_mri_spec: master - - - target_ruby: "head" - arch: "x86-msvcrt" - build_ruby: "3.0.7/x64" - run_mri_spec: master - runs-on: windows-latest env: arch: ${{ matrix.arch }} @@ -124,7 +79,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 From 458d8266b093366df9289c55b4857e79296ef9a2 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 23 May 2024 20:28:15 -0400 Subject: [PATCH 05/11] Readd jobs --- .github/workflows/ci.yml | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 795a5ce18..418cc30bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,11 +11,56 @@ jobs: fail-fast: false matrix: include: + - target_ruby: "3.3.1" + arch: "x86-msvcrt" + build_ruby: "3.1.5/x64" + run_mri_spec: v3_3_0 + + - target_ruby: "3.3.1" + arch: "x64-ucrt" + build_ruby: "3.1.5/x64" + run_mri_spec: v3_3_0 + - target_ruby: "3.2.4" arch: "x86-msvcrt" build_ruby: "3.1.5/x64" run_mri_spec: v3_2_2 + - target_ruby: "3.2.4" + arch: "x64-ucrt" + build_ruby: "3.1.5/x64" + run_mri_spec: v3_2_2 + + - target_ruby: "3.1.5" + arch: "x86-msvcrt" + build_ruby: "3.0.7/x64" + run_mri_spec: v3_1_4 + + - target_ruby: "3.1.5" + arch: "x64-ucrt" + build_ruby: "3.0.7/x64" + run_mri_spec: v3_1_4 + + - target_ruby: "3.0.7" + arch: "x86-msvcrt" + build_ruby: "3.1.5/x64" + run_mri_spec: v3_0_6 + + - target_ruby: "3.0.7" + arch: "x64-msvcrt" + build_ruby: "3.1.5/x64" + run_mri_spec: v3_0_6 + + - target_ruby: "head" + arch: "x64-ucrt" + build_ruby: "3.0.7/x64" + run_mri_spec: master + + - target_ruby: "head" + arch: "x86-msvcrt" + build_ruby: "3.0.7/x64" + run_mri_spec: master + runs-on: windows-latest env: arch: ${{ matrix.arch }} From fafec19a073bbe54c707b704b3c3b40f2dbee126 Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Mon, 27 May 2024 10:05:15 +0530 Subject: [PATCH 06/11] removing libcrypto-3-x64.dll from recepies/sandbox --- .github/workflows/ci.yml | 2 +- recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files | 1 - recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 418cc30bb..2f8135a42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -210,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/rubyinstaller-3.2.4-x64-msvcrt.files b/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files index 12f6a3b7b..1eb3fa165 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files @@ -1,4 +1,3 @@ -bin/libcrypto-3-x64.dll bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-msvcrt-ruby320.dll diff --git a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files index 5cbc322fc..a23e680a8 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files @@ -1,4 +1,3 @@ -bin/libcrypto-3-x64.dll bin/libgcc_s_seh-1.dll bin/libssl-3-x64.dll bin/x64-ucrt-ruby320.dll From a58046504c9ef72f42090ebaf870c77ff5b26519 Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Mon, 27 May 2024 10:20:25 +0530 Subject: [PATCH 07/11] removing bin/libssl-3-x64.dll from recipes/sandbox --- recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files | 1 - recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files | 1 - 2 files changed, 2 deletions(-) diff --git a/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files b/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files index 1eb3fa165..173995736 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-msvcrt.files @@ -1,4 +1,3 @@ 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 a23e680a8..376e34a58 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files @@ -1,4 +1,3 @@ bin/libgcc_s_seh-1.dll -bin/libssl-3-x64.dll bin/x64-ucrt-ruby320.dll lib/libx64-ucrt-ruby320.dll.a From 3d8122984c71a73560989fd16a72d8438da361dc Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Mon, 27 May 2024 10:37:38 +0530 Subject: [PATCH 08/11] capidll --- recipes/sandbox/70-move-openssl-files-to-bin.rake | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/sandbox/70-move-openssl-files-to-bin.rake b/recipes/sandbox/70-move-openssl-files-to-bin.rake index 125ac2325..80c00db26 100644 --- a/recipes/sandbox/70-move-openssl-files-to-bin.rake +++ b/recipes/sandbox/70-move-openssl-files-to-bin.rake @@ -3,7 +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 From 3570bafc9d2fb2b37e9d2cc16c9b4ad2ad653e85 Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Mon, 27 May 2024 11:13:03 +0530 Subject: [PATCH 09/11] removing loader attic --- recipes/sandbox/70-move-openssl-files-to-bin.rake | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/sandbox/70-move-openssl-files-to-bin.rake b/recipes/sandbox/70-move-openssl-files-to-bin.rake index 80c00db26..ae2d844c4 100644 --- a/recipes/sandbox/70-move-openssl-files-to-bin.rake +++ b/recipes/sandbox/70-move-openssl-files-to-bin.rake @@ -3,7 +3,6 @@ if package.rubyver2 >= "3.2" osl_files = %w[ - lib/engines-3/loader_attic.dll lib/engines-3/padlock.dll lib/ossl-modules/legacy.dll ] From 570879ecee6d7e50a5b6b2505f372816a1070b53 Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Wed, 29 May 2024 00:31:09 +0530 Subject: [PATCH 10/11] trigger build again --- recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files index 376e34a58..355cd4a79 100644 --- a/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files +++ b/recipes/sandbox/rubyinstaller-3.2.4-x64-ucrt.files @@ -1,3 +1,4 @@ bin/libgcc_s_seh-1.dll bin/x64-ucrt-ruby320.dll lib/libx64-ucrt-ruby320.dll.a + From a51e91d35c59e07f22e85e6c53b6b3df69215ce3 Mon Sep 17 00:00:00 2001 From: Vishal Soni Date: Wed, 29 May 2024 00:57:19 +0530 Subject: [PATCH 11/11] removing padlock.dll from move-openssl-files-to-bin --- recipes/sandbox/70-move-openssl-files-to-bin.rake | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/sandbox/70-move-openssl-files-to-bin.rake b/recipes/sandbox/70-move-openssl-files-to-bin.rake index ae2d844c4..054249e2b 100644 --- a/recipes/sandbox/70-move-openssl-files-to-bin.rake +++ b/recipes/sandbox/70-move-openssl-files-to-bin.rake @@ -3,7 +3,6 @@ if package.rubyver2 >= "3.2" osl_files = %w[ - lib/engines-3/padlock.dll lib/ossl-modules/legacy.dll ]