summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-04 11:47:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-04 11:47:58 (GMT)
commit6d0b4fcfad9da2898dff20f7ba29f0ed45e5e5ae (patch)
tree20da0ade4f247d76d2700562129ee5648a412fc1 /.github/workflows
parent2c2578a0600e14b28846874c3019c830176f3fe6 (diff)
downloadtcl-6d0b4fcfad9da2898dff20f7ba29f0ed45e5e5ae.zip
tcl-6d0b4fcfad9da2898dff20f7ba29f0ed45e5e5ae.tar.gz
tcl-6d0b4fcfad9da2898dff20f7ba29f0ed45e5e5ae.tar.bz2
Sync *.yml changes with Tk. Add OPTS=static,staticpkg Windows build
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/linux-build.yml8
-rw-r--r--.github/workflows/mac-build.yml6
-rw-r--r--.github/workflows/win-build.yml23
3 files changed, 19 insertions, 18 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 69580c2..4aedf41 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
- cfgopt:
+ config:
- ""
- "--disable-shared"
- "--enable-symbols"
@@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v4
- name: Install 32-bit dependencies if needed
# Duplicated from above
- if: ${{ matrix.cfgopt == 'CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit' }}
+ if: ${{ matrix.config == 'CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit' }}
run: |
sudo apt-get update
sudo apt-get install gcc-multilib libc6-dev-i386
@@ -42,12 +42,12 @@ jobs:
run: |
touch tclStubInit.c tclOOStubInit.c
working-directory: generic
- - name: Configure ${{ matrix.cfgopt }}
+ - name: Configure ${{ matrix.config }}
run: |
mkdir "${HOME}/install dir"
./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
env:
- CFGOPT: ${{ matrix.cfgopt }}
+ CFGOPT: ${{ matrix.config }}
- name: Build
run: |
make all
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 1645bc7..db91343 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -34,7 +34,7 @@ jobs:
runs-on: macos-11
strategy:
matrix:
- cfgopt:
+ config:
- ""
- "--disable-shared"
- "--enable-symbols"
@@ -52,11 +52,11 @@ jobs:
touch tclStubInit.c tclOOStubInit.c
mkdir "$HOME/install dir"
working-directory: generic
- - name: Configure ${{ matrix.cfgopt }}
+ - name: Configure ${{ matrix.config }}
# Note that macOS is always a 64 bit platform
run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
env:
- CFGOPT: ${{ matrix.cfgopt }}
+ CFGOPT: ${{ matrix.config }}
- name: Build
run: |
make all tcltest
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 29ea421..6966891 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -20,32 +20,33 @@ jobs:
working-directory: win
strategy:
matrix:
- cfgopt:
+ config:
- ""
- - "OPTS=static,msvcrt"
- "OPTS=symbols"
- "OPTS=symbols STATS=compdbg,memdbg"
+ - "OPTS=static,msvcrt"
+ - "OPTS=static,staticpkg,msvcrt"
# Using powershell means we need to explicitly stop on failure
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Init MSVC
uses: ilammy/msvc-dev-cmd@v1
- - name: Build ${{ matrix.cfgopt }}
+ - name: Build ${{ matrix.config }}
run: |
- &nmake -f makefile.vc ${{ matrix.cfgopt }} all
+ &nmake -f makefile.vc ${{ matrix.config }} all
if ($lastexitcode -ne 0) {
throw "nmake exit code: $lastexitcode"
}
- - name: Build Test Harness ${{ matrix.cfgopt }}
+ - name: Build Test Harness ${{ matrix.config }}
run: |
- &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest
+ &nmake -f makefile.vc ${{ matrix.config }} tcltest
if ($lastexitcode -ne 0) {
throw "nmake exit code: $lastexitcode"
}
- - name: Run Tests ${{ matrix.cfgopt }}
+ - name: Run Tests ${{ matrix.config }}
run: |
- &nmake -f makefile.vc ${{ matrix.cfgopt }} test
+ &nmake -f makefile.vc ${{ matrix.config }} test
if ($lastexitcode -ne 0) {
throw "nmake exit code: $lastexitcode"
}
@@ -57,7 +58,7 @@ jobs:
working-directory: win
strategy:
matrix:
- cfgopt:
+ config:
- ""
- "--disable-shared"
- "--enable-symbols"
@@ -77,11 +78,11 @@ jobs:
touch tclStubInit.c tclOOStubInit.c
mkdir "${HOME}/install dir"
working-directory: generic
- - name: Configure ${{ matrix.cfgopt }}
+ - name: Configure ${{ matrix.config }}
run: |
./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
env:
- CFGOPT: --enable-64bit ${{ matrix.cfgopt }}
+ CFGOPT: --enable-64bit ${{ matrix.config }}
- name: Build
run: make all
- name: Build Test Harness