Merge e57bbc0 into 6633ccc

Author: sue445

.github/workflows/build.yml

@@ -136,10 +136,16 @@ jobs:
 
       - run: echo $CGO_CFLAGS
 
+      - name: export BUILD_TAG for golangci-lint
+        run: BUILD_TAG=$(bundle exec rake go:build_tag) >> $GITHUB_ENV
+
+      - run: echo $BUILD_TAG
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
           version: v1.60
+          args: --build-tags ${{ env.BUILD_TAG }}
 
       - name: Slack Notification (not success)
         uses: act10ns/slack@v2

.github/workflows/matrix.json

@@ -3,6 +3,7 @@
     "1.23"
   ],
   "ruby": [
-    "3.3"
+    "3.3",
+    "3.4"
   ]
 }

Gemfile.lock

@@ -31,8 +31,8 @@ GEM
     debug_inspector (1.2.0)
     diff-lcs (1.5.1)
     drb (2.2.1)
-    ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.1)
+    ffi (1.17.1-arm64-darwin)
     fileutils (1.7.3)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)

_gem/go_gem.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Helpers for compiling Go extensions for ruby"
   spec.homepage = "https://github.com/ruby-go-gem/go-gem-wrapper"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.3.0"
+  spec.required_ruby_version = [">= 3.3.0", "< 3.5.0"]
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "#{spec.homepage}/tree/main/_gem"

_gem/lib/go_gem/mkmf.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "util"
+
 module GoGem
   # Helper module for creating Go Makefiles
   module Mkmf
@@ -35,11 +37,13 @@ def $objs.empty?; false; end
 
       current_dir = File.expand_path(".")
 
+      goflags = "-tags=#{GoGem::Util.ruby_minor_version_build_tag}"
+
       File.open("Makefile", "a") do |f|
         f.write <<~MAKEFILE.gsub(/^ {8}/, "\t")
           $(DLLIB): Makefile $(srcdir)/*.go
                   cd $(srcdir); \
-                  CGO_CFLAGS='$(INCFLAGS)' CGO_LDFLAGS='#{ldflags}' \
+                  CGO_CFLAGS='$(INCFLAGS)' CGO_LDFLAGS='#{ldflags}' GOFLAGS='#{goflags}' \
                     go build -p 4 -buildmode=c-shared -o #{current_dir}/$(DLLIB)
         MAKEFILE
       end

_gem/lib/go_gem/rake_task.rb

@@ -3,6 +3,8 @@
 require "rake"
 require "rake/tasklib"
 
+require_relative "util"
+
 module GoGem
   # Provides rake tasks for `go test` with CRuby
   #
@@ -40,7 +42,7 @@ module GoGem
   #       end
   #     end
   #   end
-  class RakeTask < ::Rake::TaskLib
+  class RakeTask < ::Rake::TaskLib # rubocop:disable Metrics/ClassLength
     DEFAULT_TASK_NAMESPACE = :go
 
     DEFAULT_GO_BIN_PATH = "go"
@@ -87,27 +89,16 @@ def initialize(gem_name)
         define_go_testrace_task
         define_go_fmt_task
         define_go_build_envs_task
+        define_go_build_tag_task
       end
     end
 
     # Generate environment variables to build go programs in the Go gem
     #
     # @return [Hash<String, String>]
     def self.build_env_vars
-      ldflags = "-L#{RbConfig::CONFIG["libdir"]} -l#{RbConfig::CONFIG["RUBY_SO_NAME"]}"
-
-      case `#{RbConfig::CONFIG["CC"]} --version` # rubocop:disable Lint/LiteralAsCondition
-      when /Free Software Foundation/
-        ldflags << " -Wl,--unresolved-symbols=ignore-all"
-      when /clang/
-        ldflags << " -undefined dynamic_lookup"
-      end
-
-      cflags = [
-        RbConfig::CONFIG["CFLAGS"],
-        "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}",
-        "-I#{RbConfig::CONFIG["rubyhdrdir"]}",
-      ].join(" ")
+      ldflags = generate_ldflags
+      cflags = generate_cflags
 
       # FIXME: Workaround for Ubuntu (GitHub Actions)
       if RUBY_PLATFORM =~ /linux/i
@@ -123,12 +114,44 @@ def self.build_env_vars
       ld_library_path = RbConfig::CONFIG["libdir"].to_s
 
       {
+        "GOFLAGS"         => generate_goflags,
         "CGO_CFLAGS"      => cflags,
         "CGO_LDFLAGS"     => ldflags,
         "LD_LIBRARY_PATH" => ld_library_path,
       }
     end
 
+    # @return [String]
+    def self.generate_goflags
+      "-tags=#{GoGem::Util.ruby_minor_version_build_tag}"
+    end
+    private_class_method :generate_goflags
+
+    # @return [String]
+    def self.generate_ldflags
+      ldflags = "-L#{RbConfig::CONFIG["libdir"]} -l#{RbConfig::CONFIG["RUBY_SO_NAME"]}"
+
+      case `#{RbConfig::CONFIG["CC"]} --version` # rubocop:disable Lint/LiteralAsCondition
+      when /Free Software Foundation/
+        ldflags << " -Wl,--unresolved-symbols=ignore-all"
+      when /clang/
+        ldflags << " -undefined dynamic_lookup"
+      end
+
+      ldflags
+    end
+    private_class_method :generate_ldflags
+
+    # @return [String]
+    def self.generate_cflags
+      [
+        RbConfig::CONFIG["CFLAGS"],
+        "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}",
+        "-I#{RbConfig::CONFIG["rubyhdrdir"]}",
+      ].join(" ")
+    end
+    private_class_method :generate_cflags
+
     # @yield
     def within_target_dir
       Dir.chdir(target_dir) do # rubocop:disable Style/ExplicitBlockArgument
@@ -183,5 +206,12 @@ def define_go_build_envs_task
         end
       end
     end
+
+    def define_go_build_tag_task
+      desc "Print build tag"
+      task(:build_tag) do
+        puts GoGem::Util.ruby_minor_version_build_tag
+      end
+    end
   end
 end

_gem/lib/go_gem/util.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module GoGem
+  # Common utility methods for {GoGem::Mkmf} and {GoGem::RakeTask}
+  module Util
+    # Return ruby version build tag for `go build` and `go test`
+    #
+    # @param ruby_version [String]
+    # @return [String]
+    #
+    # @example
+    #   GoGem::Util.ruby_minor_version_build_tag("3.4.1")
+    #   #=> "ruby_3_4"
+    def self.ruby_minor_version_build_tag(ruby_version = RUBY_VERSION)
+      "ruby_#{ruby_version.to_f.to_s.gsub(".", "_")}"
+    end
+  end
+end

_gem/sig/go_gem/rake_task.rbs

@@ -28,7 +28,13 @@ module GoGem
 
     def initialize: (String gem_name) ?{ (RakeTask) -> void } -> void
 
-    def self.build_env_vars: () -> { "CGO_CFLAGS" => String, "CGO_LDFLAGS" => String, "LD_LIBRARY_PATH" => String }
+    def self.build_env_vars: () -> { "GOFLAGS" => String, "CGO_CFLAGS" => String, "CGO_LDFLAGS" => String, "LD_LIBRARY_PATH" => String }
+
+    def self.generate_goflags: () -> String
+
+    def self.generate_ldflags: () -> String
+
+    def self.generate_cflags: () -> String
 
     private
 
@@ -40,6 +46,8 @@ module GoGem
 
     def define_go_build_envs_task: () -> void
 
+    def define_go_build_tag_task: () -> void
+
     def within_target_dir: () { () -> void } -> void
 
     def ext_dir: () -> String

_gem/sig/go_gem/util.rbs

@@ -0,0 +1,5 @@
+module GoGem
+  module Util
+    def self.ruby_minor_version_build_tag: (?String ruby_version) -> String
+  end
+end

_gem/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require "go_gem"
 require "go_gem/mkmf"
 require "go_gem/rake_task"
+require "go_gem/util"
 
 require "tmpdir"
 require "serverspec"