Skip to content

Commit 6988ab4

Browse files
committed
install: use newer version of nagelfar (1.3.5)
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent c4b0f96 commit 6988ab4

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.cirrus.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,9 @@ task:
9797
image: ghcr.io/cirruslabs/macos-runner:sonoma
9898
reqinstall_script:
9999
- brew update
100-
# keep Tcl 8 as current Nagelfar archive requires 8.5+, but not Tcl 9
101-
- brew install md5sha1sum expect dejagnu grep fish r tcl-tk@8 gzip powershell
100+
- brew install md5sha1sum expect dejagnu grep fish r tcl-tk gzip powershell
102101
configure_script:
103-
- ./configure --prefix=/tmp/modules --with-loadedmodules=null:dot --with-tcl=/opt/homebrew/Cellar/tcl-tk@8/8.6.16/lib
102+
- ./configure --prefix=/tmp/modules --with-loadedmodules=null:dot --with-tcl=/opt/homebrew/lib --with-tclsh=/opt/homebrew/bin/tclsh
104103
<< : *BUILD_INSTALL_TEST_TEMPLATE
105104
coverage_script:
106105
- for f in tcl/*.tcl; do script/nglfar2ccov $f; done

.github/workflows/linux_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
tcl85-nolibtclenvmodules:
6969
runs-on: ubuntu-20.04
7070
env:
71-
CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --disable-libtclenvmodules --with-tcl=/usr/local/lib --enable-versioning --with-loadedmodules=null:dot --without-pager --disable-avail-indepth --with-terminal-background=light --with-unload-match-order=returnfirst --disable-implicit-default --with-search-match=contains --with-locked-configs=extra_siteconfig --disable-auto-handling --disable-extended-default --disable-advanced-version-spec --disable-color --with-icase=never --with-tcl-linter=nagelfar132/nagelfar.tcl
71+
CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --disable-libtclenvmodules --with-tcl=/usr/local/lib --enable-versioning --with-loadedmodules=null:dot --without-pager --disable-avail-indepth --with-terminal-background=light --with-unload-match-order=returnfirst --disable-implicit-default --with-search-match=contains --with-locked-configs=extra_siteconfig --disable-auto-handling --disable-extended-default --disable-advanced-version-spec --disable-color --with-icase=never --with-tcl-linter=nagelfar135/nagelfar.tcl
7272
COVERAGE: y
7373
EXTRA_SCRIPT_PRETEST: make install-testinitrc install-testsiteconfig
7474
EXTRA_SCRIPT_POSTTEST: make uninstall-testconfig

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ WGET := wget --retry-connrefused --waitretry=20 --timeout=20 --tries=3
1717

1818
# definitions for code coverage
1919
NAGELFAR_DLSRC1 := http://downloads.sourceforge.net/nagelfar/
20-
NAGELFAR_RELEASE := nagelfar133
20+
NAGELFAR_RELEASE := nagelfar135
2121
NAGELFAR_DIST := $(NAGELFAR_RELEASE).tar.gz
22-
NAGELFAR_DISTSUM := ab3451c8ba6b1ec9d9e26dec7e17b954
22+
NAGELFAR_DISTSUM := 0305ae1617a365626f45fc08909c6f58
2323
NAGELFAR := $(NAGELFAR_RELEASE)/nagelfar.tcl
2424

2525
# definition for old Tcl interpreter for coverage testing

0 commit comments

Comments
 (0)