summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/linux-build.yml20
-rw-r--r--.github/workflows/mac-build.yml4
-rw-r--r--.github/workflows/win-build.yml3
3 files changed, 14 insertions, 13 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index ab69f4b..8270ed7 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 0dc2bc7..396b4e4 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -19,7 +19,7 @@ jobs:
shell: bash
working-directory: tk/macosx
steps:
- - name: Check out Tk
+ - name: Checkout Tk
uses: actions/checkout@v4
with:
path: tk
@@ -71,7 +71,7 @@ jobs:
shell: bash
working-directory: tk/unix
steps:
- - name: Check out Tk
+ - name: Checkout Tk
uses: actions/checkout@v4
with:
path: tk
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 40b4a6e..96700af 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