From 5abd024785fc4b5916fa6296a7c4542d2ec07fbe Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Fri, 25 May 2018 11:41:14 +0200 Subject: [PATCH 1/2] Fix: OSX icu module --- .travis.yml | 2 +- sqlite3_opt_icu.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4071647..914e92e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -157,7 +157,7 @@ before_install: - | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update - brew install icu4c + brew upgrade icu4c fi - | if [[ "${GOOS}" != "windows" ]]; then diff --git a/sqlite3_opt_icu.go b/sqlite3_opt_icu.go index 8807aef..9bc0c61 100644 --- a/sqlite3_opt_icu.go +++ b/sqlite3_opt_icu.go @@ -9,5 +9,7 @@ package sqlite3 /* #cgo LDFLAGS: -licuuc -licui18n #cgo CFLAGS: -DSQLITE_ENABLE_ICU +#cgo darwin CFLAGS: -I/usr/local/opt/icu4c/include +#cgo darwin LDFLAGS: -L/usr/local/opt/icu4c/lib */ import "C" From 2cee2f9651f3967dfb7a54d954983335d2e1cc71 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Fri, 25 May 2018 12:24:41 +0200 Subject: [PATCH 2/2] Update Travis CI Removed: 32Bit Windows Cross-Compile Aggregated: sqlite_trace into main module build --- .travis.yml | 81 +++-------------------------------------------------- 1 file changed, 4 insertions(+), 77 deletions(-) diff --git a/.travis.yml b/.travis.yml index 914e92e..ba8c891 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ env: matrix: - GOTAGS= - GOTAGS=libsqlite3 - - GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" - - GOTAGS=sqlite_trace + - GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" - GOTAGS=sqlite_vacuum_full - GOTAGS=sqlite_vacuum_incr - GOTAGS=sqlite_vtable @@ -25,129 +24,57 @@ go: matrix: include: - - os: linux - go: 1.8.x - env: GOTAGS= GOOS=windows GOARCH=386 - os: linux go: 1.8.x env: GOTAGS= GOOS=windows GOARCH=amd64 - - os: linux - go: 1.8.x - env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386 - os: linux go: 1.8.x env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 - os: linux go: 1.8.x - env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x - env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386 + env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64 - os: linux go: 1.8.x env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386 - os: linux go: 1.8.x env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 - - os: linux - go: 1.8.x - env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386 - os: linux go: 1.8.x env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS= GOOS=windows GOARCH=386 - os: linux go: 1.9.x env: GOTAGS= GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386 - os: linux go: 1.9.x env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x - env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x - env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386 + env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64 - os: linux go: 1.9.x env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386 - os: linux go: 1.9.x env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 - - os: linux - go: 1.9.x - env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386 - os: linux go: 1.9.x env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS= GOOS=windows GOARCH=386 - os: linux go: 1.10.x env: GOTAGS= GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS=libsqlite3 GOOS=windows GOARCH=386 - os: linux go: 1.10.x env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x - env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x - env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386 + env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_trace sqlite_userauth" GOOS=windows GOARCH=amd64 - os: linux go: 1.10.x env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=386 - os: linux go: 1.10.x env: GOTAGS=sqlite_vacuum_incr GOOS=windows GOARCH=amd64 - - os: linux - go: 1.10.x - env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=386 - os: linux go: 1.10.x env: GOTAGS=sqlite_vtable GOOS=windows GOARCH=amd64