diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2023-11-23 15:01:28 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2023-11-23 15:01:28 (GMT) |
| commit | c033d820b6c618e7fb07529d84cc00ffab7f35bf (patch) | |
| tree | 010ba2f5ff9b246062f974b43a100abcd075de03 /.github | |
| parent | 627aaff5dc99c77f3a8f6d846e50f7507c79c51a (diff) | |
| download | tcl-c033d820b6c618e7fb07529d84cc00ffab7f35bf.zip tcl-c033d820b6c618e7fb07529d84cc00ffab7f35bf.tar.gz tcl-c033d820b6c618e7fb07529d84cc00ffab7f35bf.tar.bz2 | |
Fixes to parsing of patchlevel
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/onefiledist.yml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 8fec3e1..d271fc1 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -26,8 +26,11 @@ jobs: echo "VER_PATH=$(cd tools; pwd)/addVerToFile.tcl" >> $GITHUB_ENV working-directory: . - name: Configure - run: ./configure --disable-symbols --disable-shared --enable-zipfs + run: | + ./configure --disable-symbols --disable-shared --enable-zipfs + sed -n '/^PATCH_LEVEL/{s/.*= /patchlevel=/;p}' < Makefile >> $GITHUB_OUTPUT working-directory: unix + id: cfg - name: Build run: | make tclsh @@ -40,10 +43,12 @@ jobs: chmod +x tclsh${TCL_PATCHLEVEL}_snapshot tar -cf tclsh${TCL_PATCHLEVEL}_snapshot.tar tclsh${TCL_PATCHLEVEL}_snapshot working-directory: 1dist + env: + TCL_PATCHLEVEL: ${{ steps.cfg.outputs.patchlevel }} - name: Upload uses: actions/upload-artifact@v3 with: - name: Tclsh ${{ env.TCL_PATCHLEVEL }} Linux single-file build (snapshot) + name: Tclsh ${{ steps.cfg.outputs.patchlevel }} Linux single-file build (snapshot) path: 1dist/*.tar macos: name: macOS @@ -72,8 +77,11 @@ jobs: echo "CREATE_DMG=$(cd create-dmg;pwd)/create-dmg" >> $GITHUB_ENV echo "CFLAGS=-arch x86_64 -arch arm64" >> $GITHUB_ENV - name: Configure - run: ./configure --disable-symbols --disable-shared --enable-zipfs + run: | + ./configure --disable-symbols --disable-shared --enable-zipfs + sed -n '/^PATCH_LEVEL/{s/.*= /patchlevel=/;p}' < Makefile >> $GITHUB_OUTPUT working-directory: unix + id: cfg - name: Build run: | make tclsh @@ -103,10 +111,12 @@ jobs: "Tcl-$TCL_PATCHLEVEL-(snapshot).dmg" \ "contents/" working-directory: 1dist + env: + TCL_PATCHLEVEL: ${{ steps.cfg.outputs.patchlevel }} - name: Upload uses: actions/upload-artifact@v3 with: - name: Tclsh ${{ env.TCL_PATCHLEVEL }} macOS single-file build (snapshot) + name: Tclsh ${{ steps.cfg.outputs.patchlevel }} macOS single-file build (snapshot) path: 1dist/*.dmg win: name: Windows @@ -133,8 +143,11 @@ jobs: mkdir 1dist working-directory: . - name: Configure - run: ./configure $CFGOPT + run: | + ./configure $CFGOPT + sed -n '/^PATCH_LEVEL/{s/.*= /patchlevel=/;p}' < Makefile >> $GITHUB_OUTPUT working-directory: win + id: cfg - name: Build run: | make binaries libraries @@ -148,8 +161,10 @@ jobs: run: | cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_snapshot.exe working-directory: 1dist + env: + TCL_PATCHLEVEL: ${{ steps.cfg.outputs.patchlevel }} - name: Upload uses: actions/upload-artifact@v3 with: - name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (snapshot) + name: Tclsh ${{ steps.cfg.outputs.patchlevel }} Windows single-file build (snapshot) path: '1dist/*_snapshot.exe' |