summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2020-11-09 09:09:58 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2020-11-09 09:09:58 (GMT)
commitd324952fd44afc70117c1a7632f638486d4469b6 (patch)
tree051e03c56f6a4b4f1400f8e74596a7c5e00d9598
parenta748303dfa5acf9a2cf632fe16dabed351e81881 (diff)
parentf25b28850555bfe69d1d776b9bde3bc0902de533 (diff)
downloadtcl-d324952fd44afc70117c1a7632f638486d4469b6.zip
tcl-d324952fd44afc70117c1a7632f638486d4469b6.tar.gz
tcl-d324952fd44afc70117c1a7632f638486d4469b6.tar.bz2
Merge 8.7
-rw-r--r--.github/workflows/linux-build.yml37
-rw-r--r--.github/workflows/win-build.yml22
-rw-r--r--.project15
-rw-r--r--README.md12
4 files changed, 85 insertions, 1 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
new file mode 100644
index 0000000..db46cfd
--- /dev/null
+++ b/.github/workflows/linux-build.yml
@@ -0,0 +1,37 @@
+name: Linux Build and Test
+on: [push]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Configure
+ working-directory: unix
+ run: |
+ mkdir "${HOME}/install dir"
+ ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
+ - name: Build
+ working-directory: unix
+ run: |
+ make all
+ - name: Build Test Harness
+ working-directory: unix
+ run: |
+ make tcltest
+ - name: Run Tests
+ working-directory: unix
+ run: |
+ make test
+ - name: Test-Drive Installation
+ working-directory: unix
+ run: |
+ make install
+ - name: Create Distribution Package
+ working-directory: unix
+ run: |
+ make dist
+ - name: Convert Documentation to HTML
+ working-directory: unix
+ run: |
+ make html-tcl
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
new file mode 100644
index 0000000..652b34a
--- /dev/null
+++ b/.github/workflows/win-build.yml
@@ -0,0 +1,22 @@
+name: Windows Build and Test
+on: [push]
+jobs:
+ build:
+ runs-on: windows-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Init MSVC
+ uses: ilammy/msvc-dev-cmd@v1
+ - name: Build
+ working-directory: win
+ run: |
+ nmake -f makefile.vc all
+ - name: Build Test Harness
+ working-directory: win
+ run: |
+ nmake -f makefile.vc tcltest
+ - name: Run Tests
+ working-directory: win
+ run: |
+ nmake -f makefile.vc test
diff --git a/.project b/.project
index f274ff9..9faba8a 100644
--- a/.project
+++ b/.project
@@ -5,7 +5,22 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>
diff --git a/README.md b/README.md
index 466cb21..fd4097a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,17 @@ This is the **Tcl 9.0a2** source distribution.
You can get any source release of Tcl from [our distribution
site](https://sourceforge.net/projects/tcl/files/Tcl/).
-[![Build Status](https://travis-ci.org/tcltk/tcl.svg?branch=master)](https://travis-ci.org/tcltk/tcl)
+8.6.10
+[![Build Status](https://github.com/tcltk/tcl/workflows/Linux%20Build%20and%20Test/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Linux+Build+and+Test%22+branch%3Acore-8-6-branch)
+[![Build Status](https://github.com/tcltk/tcl/workflows/Windows%20Build%20and%20Test/badge.svg?branch=core-8-6-branch)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Windows+Build+and+Test%22+branch%3Acore-8-6-branch)
+<br>
+8.7a4
+[![Build Status](https://github.com/tcltk/tcl/workflows/Linux%20Build%20and%20Test/badge.svg?branch=core-8-branch)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Linux+Build+and+Test%22+branch%3Acore-8-branch)
+[![Build Status](https://github.com/tcltk/tcl/workflows/Windows%20Build%20and%20Test/badge.svg?branch=core-8-branch)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Windows+Build+and+Test%22+branch%3Acore-8-branch)
+<br>
+9.0a2
+[![Build Status](https://github.com/tcltk/tcl/workflows/Linux%20Build%20and%20Test/badge.svg?branch=main)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Linux+Build+and+Test%22+branch%3Amain)
+[![Build Status](https://github.com/tcltk/tcl/workflows/Windows%20Build%20and%20Test/badge.svg?branch=main)](https://github.com/tcltk/tcl/actions?query=workflow%3A%22Windows+Build+and+Test%22+branch%3Amain)
## Contents
1. [Introduction](#intro)