From 55df7a8d1c9ba4589928b5f161a132a807b4f58d Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Sun, 10 Mar 2024 07:14:38 +0000 Subject: [PATCH] GitHub CI: add missing setuptools on macOS; it needs python@3.12 --- .github/workflows/c-cpp.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 5a70ef0..6f217f4 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -46,9 +46,9 @@ jobs: - name: Install dependencies (macOS) if: ${{ matrix.os == 'macos-latest' }} run: | - brew install autoconf automake help2man python cython flex texinfo gperf groff gnu-tar + brew install autoconf automake help2man python@3.12 python-setuptools cython flex texinfo gperf groff gnu-tar # Prepend optional brew binary directories to PATH - echo "/usr/local/opt/gnu-tar/libexec/gnubin:/usr/local/opt/flex/bin:/usr/local/opt/m4/bin:/usr/local/opt/texinfo/bin:/usr/local/opt/gettext/bin:/usr/local/opt/cython/bin" >> $GITHUB_PATH + echo "$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$(brew --prefix)/opt/flex/bin:$(brew --prefix)/opt/m4/bin:$(brew --prefix)/opt/texinfo/bin:$(brew --prefix)/opt/gettext/bin:$(brew --prefix)/opt/python@3.12/libexec/bin:$(brew --prefix)/opt/cython/bin" >> $GITHUB_PATH - name: Set up environment (Ubuntu) if: ${{ matrix.os == 'ubuntu-latest' }} # FIXME: ASAN @@ -60,7 +60,6 @@ jobs: run: | echo "LDFLAGS=-L/usr/local/opt/flex/lib -L/usr/local/opt/gettext/lib" >> $GITHUB_ENV echo "CPPFLAGS=-I/usr/local/opt/flex/include" >> $GITHUB_ENV - echo "PYTHON=/usr/local/bin/python3" >> $GITHUB_ENV - name: Set up environment (Windows) if: ${{ matrix.os == 'windows-latest' }} run: |