diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-05-26 14:26:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-05-26 14:26:41 (GMT) |
| commit | 775ba5eeb2cebbd896fc16e6e95de6aecd32f288 (patch) | |
| tree | a28a58b3b9da9cb13af3bd6e1a6bb51dd998c6d0 /.github | |
| parent | 3550518c9e40db2bab4ceb69a0ce11ed71adae65 (diff) | |
| download | tk-775ba5eeb2cebbd896fc16e6e95de6aecd32f288.zip tk-775ba5eeb2cebbd896fc16e6e95de6aecd32f288.tar.gz tk-775ba5eeb2cebbd896fc16e6e95de6aecd32f288.tar.bz2 | |
Test Tk 8.5 on MacOS with XQuarz only
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/mac-build.yml | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 0fc1d04..7378565 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -23,14 +23,10 @@ jobs: run: | touch ../generic/tkStubInit.c ../doc/man.macros mkdir "$HOME/install" - echo "USE_XVFB=$USE_XVFB" >> $GITHUB_ENV - env: - USE_XVFB: ${{ contains(matrix.options, '--disable-aqua') }} - name: Add Tcl run: | brew install tcl-tk - - name: Add X11 (if required) - if: ${{ env.USE_XVFB == 'true' }} + - name: Add X11 run: | brew install --cask xquartz sudo /opt/X11/libexec/privileged_startx || true @@ -52,21 +48,15 @@ jobs: } - name: Run Tests run: | - if [ $USE_XVFB == true ]; then - function runXvfb { - PATH=$PATH:/opt/X11/bin - Xvfb $1 & - XVFB_PID=$! - echo Launched Xvfb $1 as process $XVFB_PID >&2 - trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID" 0 - export DISPLAY=$1 - sleep 2 - } - else - function runXvfb { - echo Xvfb not used, this is a --enable-aqua build - } - fi + function runXvfb { + PATH=$PATH:/opt/X11/bin + Xvfb $1 & + XVFB_PID=$! + echo Launched Xvfb $1 as process $XVFB_PID >&2 + trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID" 0 + export DISPLAY=$1 + sleep 2 + } ( runXvfb :0; make test-classic; exit $? ) | tee out-classic.txt || { echo "::error::Failure during Test (classic)" exit 1 |