diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-04 16:46:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-04 16:46:15 (GMT) |
| commit | d8bf9c8f5c0a48b18b637e4488adbc0b5af1c001 (patch) | |
| tree | 389f05f9b9520ab85fd401eb1fb74173fb3689a3 /.github | |
| parent | dd16e78eebdc15d760fa353c42b09d5be6cfec1b (diff) | |
| parent | ea8d7323cde1bb00e885b28cf0544b16801f5b6c (diff) | |
| download | tk-d8bf9c8f5c0a48b18b637e4488adbc0b5af1c001.zip tk-d8bf9c8f5c0a48b18b637e4488adbc0b5af1c001.tar.gz tk-d8bf9c8f5c0a48b18b637e4488adbc0b5af1c001.tar.bz2 | |
Fix [1ca3c8d9da]: nmake build with OPTS=static. Give tktest.exe a version-number
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux-build.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 3 |
3 files changed, 16 insertions, 15 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 1740ac8..08858a9 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -23,7 +23,7 @@ jobs: compiler: - "gcc" - "clang" - cfgopt: + config: - "" - "CFLAGS=-DTK_NO_DEPRECATED=1" - "--disable-shared" @@ -31,11 +31,11 @@ jobs: - "--disable-xss" - "--enable-symbols" steps: - - name: Checkout + - name: Checkout Tk uses: actions/checkout@v4 with: path: tk - - name: Checkout Tcl + - name: Checkout Tcl 8.6 uses: actions/checkout@v4 with: repository: tcltk/tcl @@ -52,9 +52,9 @@ jobs: echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV working-directory: "." env: - CFGOPT: ${{ matrix.cfgopt }} + CFGOPT: ${{ matrix.config }} COMPILER: ${{ matrix.compiler }} - OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }} + OPTS: ${{ matrix.compiler }}${{ matrix.config }} - name: Configure and Build Tcl run: | ./configure $CFGOPT "--prefix=$HOME/install dir" || { @@ -68,7 +68,7 @@ jobs: } echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV working-directory: tcl/unix - - name: Configure (opts=${{ matrix.cfgopt }}) + - name: Configure (opts=${{ matrix.config }}) run: | ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || { cat config.log @@ -130,12 +130,12 @@ jobs: matrix: compiler: - "gcc" - cfgopt: + config: - "" - "--disable-xft" - "--enable-symbols" steps: - - name: Checkout + - name: Checkout Tk uses: actions/checkout@v4 with: path: tk @@ -154,7 +154,7 @@ jobs: echo "CC=$COMPILER" >> $GITHUB_ENV working-directory: "." env: - CFGOPT: ${{ matrix.cfgopt }} + CFGOPT: ${{ matrix.config }} COMPILER: ${{ matrix.compiler }} - name: Configure and Build Tcl run: | @@ -169,7 +169,7 @@ jobs: } echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV working-directory: tcl/unix - - name: Configure ${{ matrix.cfgopt }} + - name: Configure ${{ matrix.config }} run: | ./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || { cat config.log diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 770133b..d0a9712 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -19,11 +19,11 @@ jobs: shell: bash working-directory: tk/macosx steps: - - name: Check out Tk + - name: Checkout Tk uses: actions/checkout@v4 with: path: tk - - name: Check out Tcl 8.7 + - name: Checkout Tcl uses: actions/checkout@v4 with: repository: tcltk/tcl @@ -71,11 +71,11 @@ jobs: shell: bash working-directory: tk/unix steps: - - name: Check out Tk + - name: Checkout Tk uses: actions/checkout@v4 with: path: tk - - name: Check out Tcl 8.7 + - name: Checkout Tcl uses: actions/checkout@v4 with: repository: tcltk/tcl diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index be18af3..b279b14 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -22,8 +22,9 @@ jobs: strategy: matrix: config: - - "OPTS=none" + - "" - "OPTS=symbols" + - "OPTS=static" steps: - name: Checkout Tk uses: actions/checkout@v4 |