Skip to content

Commit 4667a9e

Browse files
committed
Merge main
2 parents 558e06b + 72eda8a commit 4667a9e

24 files changed

Lines changed: 1513 additions & 1141 deletions

‎.github/workflows/linux-build.yml‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,58 @@ defaults:
77
shell: bash
88
jobs:
99
build:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
strategy:
1212
matrix:
1313
compiler:
1414
- "gcc"
15+
- "g++"
16+
- "clang"
1517
steps:
1618
- name: Checkout
17-
uses: actions/checkout@v4
18-
- name: Setup Environment
19+
uses: actions/checkout@v6
20+
- name: Checkout tclconfig
21+
uses: actions/checkout@v6
22+
with:
23+
repository: tcltk/tclconfig
24+
ref: main
25+
path: tclconfig
26+
- name: Setup Environment (compiler=${{ matrix.compiler }})
1927
run: |
20-
curl https://core.tcl-lang.org/tclconfig/tarball/main/tclconfig.tar.gz >tclconfig.tar.gz
21-
tar xfz tclconfig.tar.gz
22-
- name: Configure (not really, just enough to do a "make dist")
28+
sudo apt-get install tcl8.6-dev libgdbm-dev liblmdb-dev
29+
mkdir "$HOME/install dir"
30+
echo "CFGOPT=--with-tcl=/usr/lib/tcl8.6 --with-gdbm --with-lmdb" >> $GITHUB_ENV
31+
echo "CC=$COMPILER" >> $GITHUB_ENV
32+
env:
33+
COMPILER: ${{ matrix.compiler }}
34+
OPTS: ${{ matrix.compiler }}
35+
- name: Configure
2336
run: |
24-
sed s/@srcdir@/\./ <Makefile.in | sed s/@abs_top_builddir@/./ | sed s/@SHELL@/bash/ | sed s/@PACKAGE_NAME@/thread/ | sed s/@PACKAGE_VERSION@/9.0a1/ | sed "s/@INSTALL@/tclconfig\/install-sh/" | sed "s/@INSTALL_DATA_DIR@/tclconfig\/install-sh -d -m 755/" >Makefile
25-
touch config.status
37+
./configure $CFGOPT "--prefix=$HOME/install dir" "--exec-prefix=$HOME/install dir" || {
38+
cat config.log
39+
echo "::error::Failure during Configure"
40+
exit 1
41+
}
42+
- name: Build
43+
run: |
44+
make || {
45+
echo "::error::Failure during Build"
46+
exit 1
47+
}
48+
- name: Run Tests
49+
run: |
50+
make test || {
51+
echo "::error::Failure during Test"
52+
exit 1
53+
}
54+
env:
55+
ERROR_ON_FAILURES: 1
56+
- name: Test-Drive Installation
57+
run: |
58+
make install || {
59+
echo "::error::Failure during Install"
60+
exit 1
61+
}
2662
- name: Create Distribution Package
2763
run: |
2864
make dist || {

0 commit comments

Comments
 (0)