diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-26 08:28:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-26 08:28:35 (GMT) |
| commit | cf0a602c97b060f03a1ae8920f1ae7ed67ac6ff9 (patch) | |
| tree | 67b0c176b0db571cee21c8c59ba7fa7f82e63814 | |
| parent | fd1bc4abd1fa146225e27ff46fffed783ea52b61 (diff) | |
| parent | dbb32499b01a7bb70bdc03e0b774586245678b9b (diff) | |
| download | tcl-cf0a602c97b060f03a1ae8920f1ae7ed67ac6ff9.zip tcl-cf0a602c97b060f03a1ae8920f1ae7ed67ac6ff9.tar.gz tcl-cf0a602c97b060f03a1ae8920f1ae7ed67ac6ff9.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .github/workflows/mac-build.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 2c95399..0063b9d 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -1,8 +1,8 @@ name: macOS on: [push] jobs: - with-Xcode: - runs-on: macos-latest + xcode: + runs-on: macos-11.0 defaults: run: shell: bash @@ -20,8 +20,8 @@ jobs: env: ERROR_ON_FAILURES: 1 MAC_CI: 1 - Unix-like: - runs-on: macos-latest + clang: + runs-on: macos-11.0 strategy: matrix: symbols: @@ -44,7 +44,7 @@ jobs: working-directory: generic - name: Configure (symbols=${{ matrix.symbols }} dtrace=${{ matrix.dtrace }}) # Note that macOS is always a 64 bit platform - run: ./configure --enable-64bit ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) + run: ./configure --enable-64bit --enable-framework ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) env: CFGOPT: --enable-symbols=${{ matrix.symbols }} --enable-dtrace=${{ matrix.dtrace }} - name: Build diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index a7906cd..e6961d6 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -1,7 +1,7 @@ name: Windows on: [push] jobs: - MSVC: + msvc: runs-on: windows-latest defaults: run: @@ -34,7 +34,7 @@ jobs: env: ERROR_ON_FAILURES: 1 CI_BUILD_WITH_MSVC: 1 - MSYS-gcc: + gcc: runs-on: windows-latest defaults: run: |