Skip to content

Commit 3dff397

Browse files
committed
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.
1 parent 3dd127c commit 3dff397

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
uses: actions/cache@v4
4040
with:
4141
path: ports
42-
key: cross-compiled-v9-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
42+
key: cross-compiled-v1-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
4343
restore-keys: |
44-
cross-compiled-v9-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
45-
cross-compiled-v9-${{ matrix.platform }}-
44+
cross-compiled-v1-${{ matrix.platform }}-${{ hashFiles('**/.ports_versions') }}
45+
cross-compiled-v1-${{ matrix.platform }}-
4646
4747
- name: Build gem
4848
shell: bash

ext/tiny_tds/extconf.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ def configure_defaults
115115

116116
recipe.configure_options << "--with-openssl=#{openssl_recipe.path}"
117117
recipe.configure_options << "--with-libiconv-prefix=#{libiconv_recipe.path}"
118+
recipe.configure_options << "--sysconfdir=#{MiniPortile.windows? ? "C:/Sites" : "/usr/local/etc"}"
118119

119120
recipe.gem_platform = gem_platform
120121
recipe.cook_and_activate

0 commit comments

Comments
 (0)