Skip to content

Commit

Permalink
Merge pull request #81 from flightaware/BCK-5716
Browse files Browse the repository at this point in the history
BCK 5716 - Convert to Github Actions for CI
  • Loading branch information
bovine authored Jun 8, 2021
2 parents 949eaea + 6713ae8 commit b2a71bc
Show file tree
Hide file tree
Showing 31 changed files with 97 additions and 62 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
@@ -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
34 changes: 34 additions & 0 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
@@ -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
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/configure-linux

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/configure-osx

This file was deleted.

4 changes: 2 additions & 2 deletions README.Linux
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ctable_server/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ctable_server/ctable_client.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion ctable_server/ctable_client_server.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion ctable_server/ctable_server.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ctable_server/sttp_buffer.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion ctable_server/tests/restart_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ctable_server/tests/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ctables/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion stapi/client/cass.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion stapi/client/client.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion stapi/client/extend.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion stapi/client/pgsql.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion stapi/client/shared.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion stapi/client/uri.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 1 addition & 1 deletion stapi/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion stapi/copy.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,5 @@ namespace eval ::stapi {
}
}

package provide st_postgres 1.13.10
package provide st_postgres 1.13.12

2 changes: 1 addition & 1 deletion stapi/debug.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ namespace eval ::stapi {
}
}

package provide st_debug 1.13.10
package provide st_debug 1.13.12
2 changes: 1 addition & 1 deletion stapi/display/display.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion stapi/display/test.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ proc stapi_display_test {} {
}
}

package provide st_display_test 1.13.10
package provide st_display_test 1.13.12
2 changes: 1 addition & 1 deletion stapi/pgsql.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -379,4 +379,4 @@ namespace eval ::stapi {
}
}

package provide st_postgres 1.13.10
package provide st_postgres 1.13.12
2 changes: 1 addition & 1 deletion stapi/server/lock.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,4 @@ namespace eval ::stapi {
}
}

package provide st_locks 1.13.10
package provide st_locks 1.13.12
2 changes: 1 addition & 1 deletion stapi/server/server.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -1279,4 +1279,4 @@ namespace eval ::stapi {
}
}
package provide st_server 1.13.10
package provide st_server 1.13.12
2 changes: 1 addition & 1 deletion stapi/stapi.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

package require st_client

package provide stapi 1.13.10
package provide stapi 1.13.12

2 changes: 1 addition & 1 deletion update_ver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b2a71bc

Please sign in to comment.