diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 08:13:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 08:13:35 (GMT) |
| commit | 5d6c8b7a50f680c200d19ecb11ab08c90416eec8 (patch) | |
| tree | d1f6e3732829c4598466e332a0976c0eff2e428c /.github | |
| parent | 565102f5047086fc26e91321f457e0e14949c458 (diff) | |
| download | tk-5d6c8b7a50f680c200d19ecb11ab08c90416eec8.zip tk-5d6c8b7a50f680c200d19ecb11ab08c90416eec8.tar.gz tk-5d6c8b7a50f680c200d19ecb11ab08c90416eec8.tar.bz2 | |
Better job of locating the tclsh binary (to be unzipped for --disable-shared). Also, don't abort build when it fails
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/onefiledist.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 9668cb5..f479165 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -24,7 +24,6 @@ jobs: - name: Setup Environment run: | sudo apt-get install libxss-dev - mkdir -p install/1dist.vfs touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c touch tk/generic/tkStubInit.c echo "INST_DIR=$(cd install;pwd)" >> $GITHUB_ENV @@ -64,7 +63,7 @@ jobs: - name: Describe Installation Zip Contents if: ${{ always() }} run: | - unzip -l 1dist.zip || true + unzip -l wish${{ env.TCL_PATCHLEVEL }}_unofficial || true working-directory: ${{ env.INST_DIR }} macos: name: macOS @@ -94,7 +93,7 @@ jobs: path: create-dmg - name: Setup Environment run: | - mkdir -p install/1dist.vfs install/contents + mkdir -p install/contents touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c touch tk/generic/tkStubInit.c echo "INST_DIR=$(cd install;pwd)" >> $GITHUB_ENV @@ -172,7 +171,6 @@ jobs: run: choco install -y msys2 make zip - name: Setup Environment run: | - mkdir -p install/1dist mkdir -p install/combined touch tcl/generic/tclStubInit.c tcl/generic/tclOOStubInit.c touch tk/generic/tkStubInit.c @@ -186,7 +184,6 @@ jobs: - name: Build & Install Tcl run: | make binaries libraries install - echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV $INST_DIR/bin/tclsh* $VER_PATH $GITHUB_ENV working-directory: tcl/win - name: Configure Tk |