diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-21 10:41:09 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-21 10:41:09 (GMT) |
commit | b0c8960e047e98418834bdddd879a3d1358c7607 (patch) | |
tree | 263474126c7397a079f6c401b94e3b661d4ad3d8 | |
parent | b3ee67a63146516c897d0cdf3aa1acfc8a54c0fe (diff) | |
parent | 617afea2de833e496113d4698a66a470fe2d0b43 (diff) | |
download | tk-b0c8960e047e98418834bdddd879a3d1358c7607.zip tk-b0c8960e047e98418834bdddd879a3d1358c7607.tar.gz tk-b0c8960e047e98418834bdddd879a3d1358c7607.tar.bz2 |
Merge 8.5
-rw-r--r-- | .github/workflows/mac-build.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 874d529..ae0ec24 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -64,17 +64,16 @@ jobs: path: tcl - name: Prepare checked out repositories run: | - touch tkStubInit.c + touch ../generic/tkStubInit.c ../doc/man.macros mkdir "$HOME/install dir" echo "USE_XVFB=$SET_DISPLAY" >> $GITHUB_ENV - working-directory: tk/generic env: SET_DISPLAY: ${{ contains(matrix.options, '--disable-aqua') }} - name: Add X11 (if required) if: ${{ env.USE_XVFB }} # This involves black magic run: | - brew cask install xquartz + brew install --cask xquartz sudo /opt/X11/lib/X11/xinit/privileged_startx.d/10-tmpdirs || true working-directory: . - name: Build Tcl @@ -108,7 +107,7 @@ jobs: CFGOPT: --enable-symbols=${{ matrix.symbols }} ${{matrix.options }} - name: Build run: | - make all tktest || { + make binaries libraries tktest || { echo "::error::Failure during Build" exit 1 } |