diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-27 13:56:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-27 13:56:45 (GMT) |
| commit | ba188f6c8c504931fa39d1778c27a56583b458e2 (patch) | |
| tree | d6bc23bb06a2a7eadf619bfa21a615b549c14bee /.github | |
| parent | 42b1424fc5d7d2f09ff77fa4b4a30da726e45627 (diff) | |
| parent | 965d357ab676a7a8cd4fe08dfafa8af9590a6197 (diff) | |
| download | tcl-ba188f6c8c504931fa39d1778c27a56583b458e2.zip tcl-ba188f6c8c504931fa39d1778c27a56583b458e2.tar.gz tcl-ba188f6c8c504931fa39d1778c27a56583b458e2.tar.bz2 | |
Merge 8.7
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux-build.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 24 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 15 |
3 files changed, 20 insertions, 22 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index a7b62dd..00060b2 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -10,6 +10,7 @@ jobs: - "--disable-shared" - "--enable-symbols" - "--enable-symbols=mem" + - "CFLAGS=-DTCL_UTF_MAX=3" defaults: run: shell: bash @@ -18,7 +19,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Prepare - run: touch tclStubInit.c tclOOStubInit.c + run: touch tclStubInit.c tclOOStubInit.c tclOOScript.h working-directory: generic - name: Configure ${{ matrix.cfgopt }} run: | diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 0063b9d..178ffa9 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -11,7 +11,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Prepare - run: touch tclStubInit.c tclOOStubInit.c + run: touch tclStubInit.c tclOOStubInit.c tclOOScript.h working-directory: generic - name: Build run: make all @@ -24,12 +24,11 @@ jobs: runs-on: macos-11.0 strategy: matrix: - symbols: - - "no" - - "mem" - dtrace: - - "no" - - "yes" + cfgopt: + - "" + - "--disable-shared" + - "--enable-symbols" + - "--enable-symbols=mem" defaults: run: shell: bash @@ -39,14 +38,14 @@ jobs: uses: actions/checkout@v2 - name: Prepare run: | - touch tclStubInit.c tclOOStubInit.c + touch tclStubInit.c tclOOStubInit.c tclOOScript.h mkdir "$HOME/install dir" working-directory: generic - - name: Configure (symbols=${{ matrix.symbols }} dtrace=${{ matrix.dtrace }}) + - name: Configure ${{ matrix.cfgopt }} # Note that macOS is always a 64 bit platform - run: ./configure --enable-64bit --enable-framework ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) + run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1) env: - CFGOPT: --enable-symbols=${{ matrix.symbols }} --enable-dtrace=${{ matrix.dtrace }} + CFGOPT: ${{ matrix.cfgopt }} - name: Build run: | make all tcltest @@ -56,6 +55,3 @@ jobs: env: ERROR_ON_FAILURES: 1 MAC_CI: 1 - - name: Trial Installation - run: | - make install diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index e6961d6..9cc8ed4 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -42,10 +42,11 @@ jobs: working-directory: win strategy: matrix: - symbols: - - "no" - - "mem" - - "all" + cfgopt: + - "" + - "--disable-shared" + - "--enable-symbols" + - "--enable-symbols=mem" # Using powershell means we need to explicitly stop on failure steps: - name: Checkout @@ -54,14 +55,14 @@ jobs: run: choco install msys2 make - name: Prepare run: | - touch tclStubInit.c tclOOStubInit.c + touch tclStubInit.c tclOOStubInit.c tclOOScript.h mkdir "${HOME}/install dir" working-directory: generic - - name: Configure (symbols=${{ matrix.symbols }}) + - name: Configure ${{ matrix.cfgopt }} run: | ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) env: - CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }} + CFGOPT: --enable-64bit ${{ matrix.cfgopt }} - name: Build run: make all - name: Build Test Harness |