diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-05-22 13:00:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-05-22 13:00:10 (GMT) |
| commit | 682690d085b357eb193b4cae9f0f0708d28af79a (patch) | |
| tree | 7197ec09139b1563d891e2369db0dcbd7c358008 | |
| parent | 19146b0e82ca1d2bf2cfc367d19d5d8ba117b4e8 (diff) | |
| parent | 3502578a9c66406f117d2c11b1491c7dec38ec50 (diff) | |
| download | tk-682690d085b357eb193b4cae9f0f0708d28af79a.zip tk-682690d085b357eb193b4cae9f0f0708d28af79a.tar.gz tk-682690d085b357eb193b4cae9f0f0708d28af79a.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .github/workflows/mac-build.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 41da00c..0bd8cf6 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -74,7 +74,7 @@ jobs: # This involves black magic run: | brew install --cask xquartz - sudo /opt/X11/lib/X11/xinit/privileged_startx.d/10-tmpdirs || true + sudo /opt/X11/libexec/privileged_startx || true working-directory: . - name: Build Tcl # Note that macOS is always a 64 bit platform @@ -119,7 +119,6 @@ jobs: 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 } @@ -133,7 +132,7 @@ jobs: exit 1 } cat out.txt | grep -q "Failed [1-9]" && { - echo "::error::Failure during Test" + echo "::error::Failure in test results" exit 1 } - name: Carry out trial installation |