diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml new file mode 100644 index 00000000..f1d3956d --- /dev/null +++ b/.github/workflows/linux-ci.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: Linux CI + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: | + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + sudo apt-get update -qq + sudo apt-get install -y gcc-7 g++-7 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7 + sudo apt-get install -y tcl8.6-dev tcllib tclx libboost-all-dev + - name: configure + run: | + autoreconf -vi + ./configure --with-tcl=/usr/lib/tcl8.6 + - name: make + run: make + - name: install + run: sudo make install + - name: test + run: make -C ctables test diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml new file mode 100644 index 00000000..296627b1 --- /dev/null +++ b/.github/workflows/mac-ci.yml @@ -0,0 +1,34 @@ +name: Mac CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: | + set -x + brew update + brew install tcl-tk || true + brew install boost || true + sudo mkdir -p /usr/local + sudo ln -sf /usr/local/opt/tcl-tk/include /usr/local/include/tcl8.6 + sudo cp /usr/local/opt/tcl-tk/lib/libtcl* /usr/local/lib + sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh + sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh8.6 + - name: configure + run: | + autoreconf -vi + ./configure --with-tcl=/usr/local/opt/tcl-tk/lib --prefix=/usr/local + - name: make + run: make + - name: install + run: sudo make install diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ae51aad9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: c - -branches: - only: - - master - -sudo: required - -os: - - linux - - osx - -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi - -install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libboost-all-dev; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install tcl-tk; fi - -script: - - autoreconf -vi - - if test -f .travis/configure-"$TRAVIS_OS_NAME"; then sh ./.travis/configure-"$TRAVIS_OS_NAME"; else sh ./configure; fi - - make clean - - make - - sudo make install - diff --git a/.travis/configure-linux b/.travis/configure-linux deleted file mode 100644 index 12c7e192..00000000 --- a/.travis/configure-linux +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -set -x -./configure --with-tcl=/usr/lib/tclConfig.sh diff --git a/.travis/configure-osx b/.travis/configure-osx deleted file mode 100644 index de96c859..00000000 --- a/.travis/configure-osx +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -set -x -./configure --with-tcl=/usr/local/opt/tcl-tk/lib --prefix=/usr/local diff --git a/README.Linux b/README.Linux index ea97d76d..58362f3f 100644 --- a/README.Linux +++ b/README.Linux @@ -9,8 +9,8 @@ autoreconf # -# Any platform-specific configure changes go here. Currently, none. +# Any platform-specific configure changes go here. # -./configure --with-pgsql "$@" +./configure --with-tcl=/usr/lib/tcl8.6 --prefix=/usr/local --with-pgsql "$@" # Then "make clean" and "make" diff --git a/configure.in b/configure.in index d1af85af..96e233fd 100755 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ dnl to configure the system for the local environment. # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([speedtables], [1.13.10]) +AC_INIT([speedtables], [1.13.12]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/ctable_server/configure.in b/ctable_server/configure.in index 5d149bdd..893ea6bd 100755 --- a/ctable_server/configure.in +++ b/ctable_server/configure.in @@ -18,7 +18,7 @@ dnl to configure the system for the local environment. # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([ctable_server], [1.13.10]) +AC_INIT([ctable_server], [1.13.12]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/ctable_server/ctable_client.tcl b/ctable_server/ctable_client.tcl index bea961c4..3dea1024 100644 --- a/ctable_server/ctable_client.tcl +++ b/ctable_server/ctable_client.tcl @@ -621,6 +621,6 @@ proc maketable {cttpUrl sock} { return [::sttp_buffer::table $cttpUrl] } -package provide ctable_client 1.13.10 +package provide ctable_client 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/ctable_server/ctable_client_server.tcl b/ctable_server/ctable_client_server.tcl index 9bccd4a5..58d620aa 100644 --- a/ctable_server/ctable_client_server.tcl +++ b/ctable_server/ctable_client_server.tcl @@ -98,6 +98,6 @@ namespace export split_ctable_url join_ctable_url } -package provide ctable_net 1.13.10 +package provide ctable_net 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/ctable_server/ctable_server.tcl b/ctable_server/ctable_server.tcl index c050707b..2d02b759 100644 --- a/ctable_server/ctable_server.tcl +++ b/ctable_server/ctable_server.tcl @@ -678,7 +678,7 @@ proc serverdie {{message ""}} { } -package provide ctable_server 1.13.10 +package provide ctable_server 1.13.12 #get, set, array_get, array_get_with_nulls, exists, delete, count, foreach, sort, type, import, import_postgres_result, export, fields, fieldtype, needs_quoting, names, reset, destroy, statistics, write_tabsep, or read_tabsep diff --git a/ctable_server/sttp_buffer.tcl b/ctable_server/sttp_buffer.tcl index bad46a33..78e48724 100644 --- a/ctable_server/sttp_buffer.tcl +++ b/ctable_server/sttp_buffer.tcl @@ -177,6 +177,6 @@ proc table {cttpUrl} { } -package provide sttp_buffer 1.13.10 +package provide sttp_buffer 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/ctable_server/tests/restart_server.sh b/ctable_server/tests/restart_server.sh index 46eead50..be396317 100755 --- a/ctable_server/tests/restart_server.sh +++ b/ctable_server/tests/restart_server.sh @@ -4,7 +4,7 @@ if [ -z "$TCLSH" ] then - TCLVERSION=8.5 + TCLVERSION=8.6 for tclsh in /usr/bin/tclsh${TCLVERSION} /usr/local/bin/tclsh${TCLVERSION} do diff --git a/ctable_server/tests/run_test.sh b/ctable_server/tests/run_test.sh index 13b06f01..0456b011 100755 --- a/ctable_server/tests/run_test.sh +++ b/ctable_server/tests/run_test.sh @@ -5,7 +5,7 @@ if [ -z "$TCLSH" ] then - TCLVERSION=8.5 + TCLVERSION=8.6 for tclsh in /usr/bin/tclsh${TCLVERSION} /usr/local/bin/tclsh${TCLVERSION} do diff --git a/ctables/configure.in b/ctables/configure.in index 7dc5e1ec..fc7e9cbf 100755 --- a/ctables/configure.in +++ b/ctables/configure.in @@ -18,7 +18,7 @@ dnl to configure the system for the local environment. # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([ctable], [1.13.10]) +AC_INIT([ctable], [1.13.12]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/stapi/client/cass.tcl b/stapi/client/cass.tcl index 9fe3581a..1b96be59 100644 --- a/stapi/client/cass.tcl +++ b/stapi/client/cass.tcl @@ -1236,6 +1236,6 @@ namespace eval ::stapi { } } -package provide st_client_cassandra 1.13.10 +package provide st_client_cassandra 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/stapi/client/client.tcl b/stapi/client/client.tcl index a7704660..0023f2dc 100644 --- a/stapi/client/client.tcl +++ b/stapi/client/client.tcl @@ -100,6 +100,6 @@ namespace eval ::stapi { register package connect_package } -package provide st_client 1.13.10 +package provide st_client 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/stapi/client/extend.tcl b/stapi/client/extend.tcl index 6629724d..80dc7f42 100644 --- a/stapi/client/extend.tcl +++ b/stapi/client/extend.tcl @@ -395,7 +395,7 @@ namespace eval ::stapi { namespace import ::stapi::extend::* } -package provide stapi_extend 1.13.10 +package provide stapi_extend 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/stapi/client/pgsql.tcl b/stapi/client/pgsql.tcl index e5132d74..23ab9766 100644 --- a/stapi/client/pgsql.tcl +++ b/stapi/client/pgsql.tcl @@ -952,6 +952,6 @@ namespace eval ::stapi { } } -package provide st_client_postgres 1.13.10 +package provide st_client_postgres 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/stapi/client/shared.tcl b/stapi/client/shared.tcl index 565c5574..0814bc96 100644 --- a/stapi/client/shared.tcl +++ b/stapi/client/shared.tcl @@ -115,6 +115,6 @@ namespace eval ::stapi { } } -package provide st_shared 1.13.10 +package provide st_shared 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/stapi/client/uri.tcl b/stapi/client/uri.tcl index 56a48e09..1729d222 100644 --- a/stapi/client/uri.tcl +++ b/stapi/client/uri.tcl @@ -40,6 +40,6 @@ namespace eval stapi { } -package provide st_client_uri 1.13.10 +package provide st_client_uri 1.13.12 # vim: set ts=8 sw=4 sts=4 noet : diff --git a/stapi/configure.in b/stapi/configure.in index abbcc5bd..e086c33e 100755 --- a/stapi/configure.in +++ b/stapi/configure.in @@ -18,7 +18,7 @@ dnl to configure the system for the local environment. # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([stapi], [1.13.10]) +AC_INIT([stapi], [1.13.12]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/stapi/copy.tcl b/stapi/copy.tcl index 14655ca7..3fd88749 100644 --- a/stapi/copy.tcl +++ b/stapi/copy.tcl @@ -165,5 +165,5 @@ namespace eval ::stapi { } } -package provide st_postgres 1.13.10 +package provide st_postgres 1.13.12 diff --git a/stapi/debug.tcl b/stapi/debug.tcl index 4b2bf495..95d557bc 100644 --- a/stapi/debug.tcl +++ b/stapi/debug.tcl @@ -54,4 +54,4 @@ namespace eval ::stapi { } } -package provide st_debug 1.13.10 +package provide st_debug 1.13.12 diff --git a/stapi/display/display.tcl b/stapi/display/display.tcl index 02f15932..20430dfa 100644 --- a/stapi/display/display.tcl +++ b/stapi/display/display.tcl @@ -2576,5 +2576,5 @@ catch { ::itcl::delete class ::STDisplayField_boolean } } ; ## ::itcl::class ::STDisplayField_boolean -package provide st_display 1.13.10 +package provide st_display 1.13.12 diff --git a/stapi/display/test.tcl b/stapi/display/test.tcl index 1e79312b..73357010 100644 --- a/stapi/display/test.tcl +++ b/stapi/display/test.tcl @@ -29,4 +29,4 @@ proc stapi_display_test {} { } } -package provide st_display_test 1.13.10 +package provide st_display_test 1.13.12 diff --git a/stapi/pgsql.tcl b/stapi/pgsql.tcl index a78f876e..3ef82591 100644 --- a/stapi/pgsql.tcl +++ b/stapi/pgsql.tcl @@ -379,4 +379,4 @@ namespace eval ::stapi { } } -package provide st_postgres 1.13.10 +package provide st_postgres 1.13.12 diff --git a/stapi/server/lock.tcl b/stapi/server/lock.tcl index db0ccba8..893de762 100644 --- a/stapi/server/lock.tcl +++ b/stapi/server/lock.tcl @@ -185,4 +185,4 @@ namespace eval ::stapi { } } -package provide st_locks 1.13.10 +package provide st_locks 1.13.12 diff --git a/stapi/server/server.tcl b/stapi/server/server.tcl index 1872fbdd..be444039 100644 --- a/stapi/server/server.tcl +++ b/stapi/server/server.tcl @@ -1279,4 +1279,4 @@ namespace eval ::stapi { } } -package provide st_server 1.13.10 +package provide st_server 1.13.12 diff --git a/stapi/stapi.tcl b/stapi/stapi.tcl index c93d33f0..399b8ab7 100644 --- a/stapi/stapi.tcl +++ b/stapi/stapi.tcl @@ -2,5 +2,5 @@ package require st_client -package provide stapi 1.13.10 +package provide stapi 1.13.12 diff --git a/update_ver.sh b/update_ver.sh index 4ffe1078..5ab460e4 100755 --- a/update_ver.sh +++ b/update_ver.sh @@ -2,7 +2,7 @@ # This script simplifies the process of incrementing all version numbers for a new release. -NEWVER="1.13.10" +NEWVER="1.13.12" perl -p -i -e "s/^(AC_INIT\\(\\[[a-z_]+\\],) \\[[0-9.]+\\]/\\1 \\[$NEWVER\\]/" configure.in ctables/configure.in stapi/configure.in ctable_server/configure.in