Skip to content

Commit

Permalink
GCC 14 support
Browse files Browse the repository at this point in the history
  • Loading branch information
stefantalpalaru committed Jul 6, 2024
1 parent b507372 commit a1b4ade
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- os: linux
cpu: i386
- os: macos
cpu: amd64
cpu: arm64
- os: windows
cpu: amd64
include:
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ${{ matrix.builder }}
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Environment variables
shell: bash
Expand Down Expand Up @@ -143,7 +143,12 @@ jobs:
if: runner.os == 'macOS'
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '13' # 14 seems buggy: https://github.com/actions/runner-images/issues/6642
xcode-version: '15' # 14 seems buggy: https://github.com/actions/runner-images/issues/6642

- name: Install build dependencies (macOS)
if: runner.os == 'macOS'
run: |
brew install xquartz --cask
- name: Run tests (macOS)
if: runner.os == 'macOS'
Expand All @@ -153,16 +158,18 @@ jobs:
make -j${ncpu}
make pythoninfo
make smelly
make buildbottest TESTOPTS="-j${ncpu} -uall,-cpu"
# Weird test failures on ARM64 macOS.
make buildbottest TESTOPTS="-j${ncpu} -uall,-cpu -x test_ctypes -x test_str -x test_time"
- name: Add msbuild to PATH
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v2

- name: Run tests (Windows)
if: runner.os == 'Windows'
# test_list and test_tuple fail randomly
run: |
.\PCbuild\build.bat -e -p x64
.\tauthon.bat -m test.pythoninfo
.\PCbuild\rt.bat -p x64 -q -uall -u-cpu -u-largefile -rwW --slowest -j2 -x test_concurrent_futures
.\PCbuild\rt.bat -p x64 -q -uall -u-cpu -u-largefile -rwW --slowest -j2 -x test_concurrent_futures -x test_list -x test_tuple
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GCC 14 support.
2 changes: 1 addition & 1 deletion Modules/_tkinter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ AsObj(PyObject *value)
return NULL;
}
if (sizeof(Py_UNICODE) == sizeof(Tcl_UniChar))
return Tcl_NewUnicodeObj(inbuf, size);
return Tcl_NewUnicodeObj((const Tcl_UniChar *)inbuf, size);
allocsize = ((size_t)size) * sizeof(Tcl_UniChar);
if (allocsize >= size)
outbuf = (Tcl_UniChar*)attemptckalloc(allocsize);
Expand Down

0 comments on commit a1b4ade

Please sign in to comment.