Skip to content

Commit 36302f6

Browse files
committed
Merge branch 'master' into BCK-5159_nix_header_location
2 parents ee5658a + 6a2b15f commit 36302f6

File tree

4 files changed

+64
-27
lines changed

4 files changed

+64
-27
lines changed

.github/workflows/linux-ci.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Linux CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Install dependencies
17+
run: |
18+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
19+
sudo apt-get update -qq
20+
sudo apt-get install -y gcc-7 g++-7
21+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7
22+
sudo apt-get install -y tcl8.6-dev
23+
- name: make
24+
run: make
25+
- name: install
26+
run: sudo make install
27+
- name: make test
28+
run: make test
29+
- name: make examples
30+
run: make examples

.github/workflows/mac-ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Mac CI
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: macos-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Install dependencies
17+
run: |
18+
brew update
19+
brew install tcl-tk || true
20+
sudo mkdir -p /usr/local
21+
sudo ln -sf /usr/local/opt/tcl-tk/include /usr/local/include/tcl8.6
22+
sudo cp /usr/local/opt/tcl-tk/lib/libtcl* /usr/local/lib
23+
sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh
24+
sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh8.6
25+
- name: make
26+
run: make
27+
- name: install
28+
run: sudo make install
29+
- name: make test
30+
run: make test
31+
- name: make examples
32+
run: make examples

.travis.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
[![Build Status](https://travis-ci.org/flightaware/cpptcl.svg?branch=master)](https://travis-ci.org/flightaware/cpptcl)
1+
![Linux CI](https://github.com/flightaware/cpptcl/workflows/Linux%20CI/badge.svg)
2+
![Mac CI](https://github.com/flightaware/cpptcl/workflows/Mac%20CI/badge.svg)
23

34
C++/Tcl - a C++ library for interoperability between C++ and Tcl.
45
========

0 commit comments

Comments
 (0)