summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-04 13:15:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-04 13:15:00 (GMT)
commitd8863bf90c39aac1110191933f13ee9b9bf8d532 (patch)
tree4c00314fef6a4b84789987759456e0f2b66d9878 /.github
parentb16a5a900917cb28a44b7cee5a7252b4ab5a8253 (diff)
parentc09ddd48e3db315912a6c3797f37c0a49a2dfb6d (diff)
downloadtcl-d8863bf90c39aac1110191933f13ee9b9bf8d532.zip
tcl-d8863bf90c39aac1110191933f13ee9b9bf8d532.tar.gz
tcl-d8863bf90c39aac1110191933f13ee9b9bf8d532.tar.bz2
Merge 8.7
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/onefiledist.yml20
1 files changed, 8 insertions, 12 deletions
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 0fb6ba5..eaf9128 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -21,13 +21,13 @@ jobs:
working-directory: unix
- name: Build
run: |
- make tclsh tclzipfile
+ make tclsh
make shell SCRIPT="$VER_PATH $GITHUB_ENV"
echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
working-directory: unix
- name: Package
run: |
- cat ../unix/tclsh $TCL_ZIP > tclsh${TCL_PATCHLEVEL}_unofficial
+ cp ../unix/tclsh tclsh${TCL_PATCHLEVEL}_unofficial
chmod +x tclsh${TCL_PATCHLEVEL}_unofficial
tar -cf tclsh${TCL_PATCHLEVEL}_unofficial.tar tclsh${TCL_PATCHLEVEL}_unofficial
working-directory: 1dist
@@ -62,7 +62,7 @@ jobs:
working-directory: unix
- name: Build
run: |
- make tclsh tclzipfile
+ make tclsh
make shell SCRIPT="$VER_PATH $GITHUB_ENV"
echo "TCL_BIN=`pwd`/tclsh" >> $GITHUB_ENV
echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
@@ -70,7 +70,7 @@ jobs:
- name: Package
run: |
mkdir contents
- cat $TCL_BIN $TCL_ZIP > contents/tclsh${TCL_PATCHLEVEL}_unofficial
+ cp $TCL_BIN contents/tclsh${TCL_PATCHLEVEL}_unofficial
chmod +x contents/tclsh${TCL_PATCHLEVEL}_unofficial
cat > contents/README.txt <<EOF
This is a single-file executable developer preview of Tcl $TCL_PATCHLEVEL
@@ -116,20 +116,16 @@ jobs:
working-directory: win
- name: Build
run: |
- make binaries libraries tclzipfile
+ make binaries libraries
echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
working-directory: win
- - name: Package
- run: |
- cat ../win/tclsh*.exe $TCL_ZIP > combined.exe
- working-directory: 1dist
- name: Get Exact Version
run: |
- ./combined.exe $VER_PATH $GITHUB_ENV
- working-directory: 1dist
+ ./tclsh*.exe $VER_PATH $GITHUB_ENV
+ working-directory: win
- name: Set Executable Name
run: |
- mv combined.exe tclsh${TCL_PATCHLEVEL}_unofficial.exe
+ cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_unofficial.exe
working-directory: 1dist
- name: Upload
uses: actions/upload-artifact@v2