diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-02 10:47:37 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-02 10:47:37 (GMT) |
commit | 29dbb0bd14e01ddbf37ca4da3aaf00151d29858e (patch) | |
tree | a1ed69ec8ee1f7710c8826aa4305ed93bd336020 /.github | |
parent | 8253b14dec0532976665ce9fbddcc166db24af0f (diff) | |
parent | e89506924ebc59f7c9bcf77f749d62f59893105e (diff) | |
download | tk-29dbb0bd14e01ddbf37ca4da3aaf00151d29858e.zip tk-29dbb0bd14e01ddbf37ca4da3aaf00151d29858e.tar.gz tk-29dbb0bd14e01ddbf37ca4da3aaf00151d29858e.tar.bz2 |
Merge 8.6
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/win-build.yml | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 9576487..53ca190 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -21,9 +21,10 @@ jobs: # Using powershell means we need to explicitly stop on failure strategy: matrix: - symbols: - - "none" - - "symbols" + config: + - "OPTS=none" + - "OPTS=static" + - "OPTS=symbols" steps: - name: Checkout Tk uses: actions/checkout@v4 @@ -45,32 +46,32 @@ jobs: mkdir install cd install echo "INSTALLDIR=`pwd`" >> $GITHUB_ENV - - name: Build Tcl (OPTS=${{ matrix.symbols }}) + - name: Build Tcl (${{ matrix.config }}) run: | - &nmake -f makefile.vc release install OPTS=${{ matrix.symbols }} + &nmake -f makefile.vc release install ${{ matrix.config }} if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } working-directory: tcl/win - - name: Build Tk (OPTS=${{ matrix.symbols }}) + - name: Build Tk (${{ matrix.config }}) run: | - &nmake -f makefile.vc all OPTS=${{ matrix.symbols }} + &nmake -f makefile.vc all ${{ matrix.config }} if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Build Test Harness (OPTS=${{ matrix.symbols }}) + - name: Build Test Harness (${{ matrix.config }}) run: | - &nmake -f makefile.vc tktest OPTS=${{ matrix.symbols }} + &nmake -f makefile.vc tktest ${{ matrix.config }} if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Run Tk Tests (OPTS=${{ matrix.symbols }}) + - name: Run Tk Tests (${{ matrix.config }}) run: | - nmake -f makefile.vc test-classic OPTS=${{ matrix.symbols }} | tee out-classic.txt || { + nmake -f makefile.vc test-classic ${{ matrix.config }} | tee out-classic.txt || { echo "::error::Failure during Test" exit 1 } - nmake -f makefile.vc test-ttk OPTS=${{ matrix.symbols }} | tee out-ttk.txt || { + nmake -f makefile.vc test-ttk ${{ matrix.config }} | tee out-ttk.txt || { echo "::error::Failure during Test" exit 1 } @@ -86,15 +87,15 @@ jobs: CI_BUILD_WITH_MSVC: 1 shell: bash timeout-minutes: 15 - - name: Build Help (OPTS=${{ matrix.symbols }}) + - name: Build Help (${{ matrix.config }}) run: | - &nmake -f makefile.vc htmlhelp OPTS=${{ matrix.symbols }} + &nmake -f makefile.vc htmlhelp ${{ matrix.config }} if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Install (OPTS=${{ matrix.symbols }}) + - name: Install (${{ matrix.config }}) run: | - &nmake -f makefile.vc install OPTS=${{ matrix.symbols }} + &nmake -f makefile.vc install ${{ matrix.config }} if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } @@ -106,10 +107,11 @@ jobs: working-directory: win strategy: matrix: - symbols: - - "no" - - "mem" - - "all" + config: + - "" + - "--enable-config=mem" + - "--enable-config=all" + - "--disable-shared" steps: - name: Install MSYS2 uses: msys2/setup-msys2@v2 @@ -131,7 +133,7 @@ jobs: mkdir "${HOME}/install_dir" echo "INSTALL_DIR=${HOME}/install_dir" >> $GITHUB_ENV working-directory: generic - - name: Configure and Build Tcl + - name: Configure and Build Tcl (${{ matrix.config }}) run: | ./configure $CFGOPT "--prefix=$INSTALL_DIR" || { cat config.log @@ -144,9 +146,9 @@ jobs: } echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV env: - CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }} + CFGOPT: --enable-64bit ${{ matrix.config }} working-directory: tcl/win - - name: Configure Tk (symbols=${{ matrix.symbols }}) + - name: Configure Tk (${{ matrix.config }}) run: | ./configure $CFGOPT "--prefix=$HOME/INSTALL_DIR" "--with-tcl=$TCL_CONFIG_PATH" || { cat config.log @@ -154,7 +156,7 @@ jobs: exit 1 } env: - CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }} + CFGOPT: --enable-64bit ${{ matrix.config }} - name: Build Tk run: | make all tktest || { |