From 3dff397386a847cd7f4d254779b67c987a2097ea Mon Sep 17 00:00:00 2001 From: Andy Pfister Date: Thu, 9 Jan 2025 13:54:34 +0100 Subject: [PATCH] Provide `sysconfdir` to FreeTDS You can use this parameter to specify a `freetds.conf` there. per default, it will use the build path, which will be some obscure thing on GitHub Actions. Although most people will customize this location at runtime using environment variables, it still makes sense to provide sensible defaults. --- .github/workflows/ci.yml | 6 +++--- ext/tiny_tds/extconf.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec714572..dc45f0f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,10 +39,10 @@ jobs: uses: actions/cache@v4 with: path: ports - key: cross-compiled-v9-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }} + key: cross-compiled-v1-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }} restore-keys: | - cross-compiled-v9-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }} - cross-compiled-v9-${{ matrix.platform }}- + cross-compiled-v1-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }} + cross-compiled-v1-${{ matrix.platform }}- - name: Build gem shell: bash diff --git a/ext/tiny_tds/extconf.rb b/ext/tiny_tds/extconf.rb index 47f6630c..5ba460cb 100644 --- a/ext/tiny_tds/extconf.rb +++ b/ext/tiny_tds/extconf.rb @@ -115,6 +115,7 @@ def configure_defaults recipe.configure_options << "--with-openssl=#{openssl_recipe.path}" recipe.configure_options << "--with-libiconv-prefix=#{libiconv_recipe.path}" + recipe.configure_options << "--sysconfdir=#{MiniPortile.windows? ? "C:/Sites" : "/usr/local/etc"}" recipe.gem_platform = gem_platform recipe.cook_and_activate