From 705dfbf813fa9f451bce6c1dc59f6134fcc1c3b9 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 10 Aug 2024 16:41:47 -0400 Subject: [PATCH 1/2] Attempt to get OSX CI working --- .github/workflows/osx.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index 1a72265..613617f 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -9,8 +9,7 @@ on: jobs: build: env: - LDFLAGS: "-L/usr/local/opt/llvm@11/lib" - CPPFLAGS: "-I/usr/local/opt/llvm@11/include" + LDFLAGS: "-L/opt/homebrew/opt/llvm/lib/c++ -L/opt/homebrew/opt/llvm/lib -lunwind" runs-on: macos-latest strategy: matrix: @@ -24,11 +23,14 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install OS dependencies run: | + brew update + brew install enchant brew install llvm tesseract enchant mysql python -m pip install --upgrade pip - # LLVM_CONFIG=/usr/local/Cellar/llvm@11/11.1.0/bin/llvm-config pip install llvmlite - pip install llvmlite - pip install pytest + pip install pytest pyenchant + PYENCHANT_VERBOSE_FIND=1 python -c 'import enchant' + + # LLVM_CONFIG=/usr/local/Cellar/llvm@18/18.1.8/bin/llvm-config pip install llvmlite # Can comment out when next Mathics core and Mathics-scanner are released # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] # Can remove after next Mathics-core release From 47915f0bc7009f79065fc9aa70592efd38872528 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 10 Aug 2024 17:28:19 -0400 Subject: [PATCH 2/2] Remove OSX CI testing for now... We need to figure out how to get C spelling libray enchant installed... Or make that optional in mathics-core. --- .github/workflows/{osx.yml => osx.yml-needs-enchant-fixup} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename .github/workflows/{osx.yml => osx.yml-needs-enchant-fixup} (90%) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml-needs-enchant-fixup similarity index 90% rename from .github/workflows/osx.yml rename to .github/workflows/osx.yml-needs-enchant-fixup index 613617f..b3bb2a1 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml-needs-enchant-fixup @@ -10,6 +10,7 @@ jobs: build: env: LDFLAGS: "-L/opt/homebrew/opt/llvm/lib/c++ -L/opt/homebrew/opt/llvm/lib -lunwind" + CPPFLAGS; "-I/opt/homebrew/opt/llvm/include" runs-on: macos-latest strategy: matrix: @@ -23,14 +24,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install OS dependencies run: | - brew update - brew install enchant brew install llvm tesseract enchant mysql python -m pip install --upgrade pip pip install pytest pyenchant PYENCHANT_VERBOSE_FIND=1 python -c 'import enchant' - # LLVM_CONFIG=/usr/local/Cellar/llvm@18/18.1.8/bin/llvm-config pip install llvmlite # Can comment out when next Mathics core and Mathics-scanner are released # python -m pip install -e git+https://github.com/Mathics3/mathics-scanner#egg=Mathics-Scanner[full] # Can remove after next Mathics-core release