Skip to content

Commit 048115d

Browse files
committed
ci: configure appveyor
use an allowlist of environment variables for configuration
1 parent 04522f4 commit 048115d

2 files changed

Lines changed: 25 additions & 23 deletions

File tree

appveyor.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
---
2-
version: "{build}"
2+
image: Visual Studio 2019
3+
34
branches:
45
only:
56
- master
6-
- 1-3-stable
7-
clone_depth: 10
7+
8+
skip_branch_with_pr: true
9+
10+
clone_depth: 1
11+
12+
cache:
13+
- vendor/bundle
14+
- ports/archives
15+
816
install:
9-
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
17+
- SET PATH=C:\ruby%ruby_version%\bin;%PATH%
1018
- ruby --version
1119
- gem --version
12-
- gem install bundler --quiet --no-ri --no-rdoc
20+
- gem install bundler --conservative
1321
- bundler --version
22+
- bundle config --local path vendor/bundle
1423
- bundle install
15-
build_script:
16-
- rake native gem
24+
25+
build: off
26+
1727
test_script:
18-
- rake test
19-
artifacts:
20-
- path: pkg\*.gem
28+
- bundle exec rake -rdevkit compile test
2129

2230
environment:
2331
matrix:
24-
- ruby_version: "193"
25-
- ruby_version: "200"
26-
- ruby_version: "200-x64"
27-
- ruby_version: "21"
28-
- ruby_version: "21-x64"
29-
- ruby_version: "22"
30-
- ruby_version: "22-x64"
31-
- ruby_version: "23"
32-
- ruby_version: "23-x64"
33-
- ruby_version: "24"
34-
- ruby_version: "24-x64"
32+
- ruby_version: "31"
33+
- ruby_version: "30"
34+
- ruby_version: "27"
35+
- ruby_version: "26"
3536
- ruby_version: "25"
36-
- ruby_version: "25-x64"

ext/sqlite3/extconf.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
recipe.configure_options += ["--enable-shared=no", "--enable-static=yes"]
2626
ENV.to_h.tap do |env|
2727
env["CFLAGS"] = [env["CFLAGS"], "-fPIC"].join(" ") # needed for linking the static library into a shared library
28-
recipe.configure_options += env.map { |key, value| "#{key}=#{value.strip}" }
28+
recipe.configure_options += env
29+
.select { |k,v| ["CC", "CFLAGS", "LDFLAGS", "LIBS", "CPPFLAGS", "LT_SYS_LIBRARY_PATH", "CPP"].include?(k) }
30+
.map { |key, value| "#{key}=#{value.strip}" }
2931
end
3032

3133
unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version))

0 commit comments

Comments
 (0)