diff options
Diffstat (limited to '.github/workflows/mac-build.yml')
| -rw-r--r-- | .github/workflows/mac-build.yml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index c93dd8f..b945ab7 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -13,7 +13,7 @@ env: ERROR_ON_FAILURES: 1 jobs: xcode: - runs-on: macos-12 + runs-on: macos-14 defaults: run: shell: bash @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v4 with: repository: tcltk/tcl - ref: core-8-6-branch + ref: core-8-branch path: tcl - name: Prepare checked out repositories run: | @@ -57,7 +57,7 @@ jobs: fi timeout-minutes: 30 clang: - runs-on: macos-12 + runs-on: macos-14 strategy: matrix: symbols: @@ -79,15 +79,16 @@ jobs: uses: actions/checkout@v4 with: repository: tcltk/tcl - ref: core-8-6-branch + ref: core-8-branch path: tcl - name: Prepare checked out repositories env: SET_DISPLAY: ${{ contains(matrix.options, '--disable-aqua') }} run: | - touch ../generic/tkStubInit.c ../doc/man.macros + touch tkStubInit.c mkdir "$HOME/install dir" echo "USE_XVFB=$SET_DISPLAY" >> $GITHUB_ENV + working-directory: tk/generic - name: Add X11 (if required) if: ${{ env.USE_XVFB == 'true' }} run: | @@ -95,9 +96,8 @@ jobs: sudo /opt/X11/libexec/privileged_startx || true working-directory: . - name: Build Tcl - # Note that macOS is always a 64 bit platform run: | - ./configure --enable-64bit $CFGOPT "--prefix=$HOME/install dir" || { + ./configure $CFGOPT --disable-zipfs "--prefix=$HOME/install dir" || { cat config.log echo "::error::Failure during Tcl Configure" exit 1 @@ -114,9 +114,8 @@ jobs: env: CFGOPT: --enable-symbols=${{ matrix.symbols }} - name: Configure (symbols=${{ matrix.symbols }} ${{matrix.options }}) - # Note that macOS is always a 64 bit platform run: | - ./configure --enable-64bit $CFGOPT "--prefix=$HOME/install dir" --disable-xft || { + ./configure $CFGOPT --disable-zipfs "--prefix=$HOME/install dir" --disable-xft || { cat config.log echo "::error::Failure during Configure" exit 1 @@ -125,7 +124,7 @@ jobs: CFGOPT: --enable-symbols=${{ matrix.symbols }} ${{matrix.options }} - name: Build run: | - make binaries libraries tktest || { + make all tktest || { echo "::error::Failure during Build" exit 1 } |