Merge pull request #544 from larskanis/ci-add-mswin

CI: Add test with mswin environment
ged · Sep 1, 2023 · d401388 · d401388
2 parents d2f231f + 459288a
commit d401388
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/source-gem.yml b/.github/workflows/source-gem.yml
@@ -42,6 +42,10 @@ jobs:
             ruby: "2.5"
             PGVERSION: 9.4.26-1-windows-x64
             PGVER: "9.4"
+          - os: windows
+            ruby: "mswin"
+            PGVERSION: 15.1-1-windows-x64
+            PGVER: "15"
           - os: ubuntu
             ruby: "head"
             PGVER: "15"
@@ -82,7 +86,7 @@ jobs:
           name: source-gem
 
       - name: Install required packages Windows
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows' && matrix.ruby != 'mswin'
         shell: cmd
         run: ridk exec sh -c "pacman --sync --needed --noconfirm  ${MINGW_PACKAGE_PREFIX}-gcc"
 

diff --git a/ext/extconf.rb b/ext/extconf.rb
@@ -60,6 +60,10 @@
 	if dlldir && RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
 		append_ldflags "-Wl,-rpath,#{dlldir.quote}"
 	end
+
+	if /mswin/ =~ RUBY_PLATFORM
+		$libs = append_library($libs, 'ws2_32')
+	end
 end
 
 $stderr.puts "Using libpq from #{dlldir}"