From cbe6d52a731c8de5fc61234e9c968a6d0d0eb505 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 5 Dec 2023 06:36:54 +0100 Subject: [PATCH 1/5] Try macos-13 CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5e6bf08c..593a5bd03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-latest ] + os: [ "macos-latest", "macos-13" ] python-version: ["3.9", "3.10", "3.11"] steps: From 2207773678f9d6a8e26405c038dcf3535e0fe5c3 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 5 Dec 2023 10:39:51 +0100 Subject: [PATCH 2/5] Attempt more granular cache for macos --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 593a5bd03..4d14f2649 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,7 +143,7 @@ jobs: id: cache with: path: ~/dependencies/ - key: ${{ runner.os }}-dependencies + key: ${{ runner.os }}-${{ env.ImageOS }}-dependencies - name: pip cache (macOS) uses: actions/cache@v3 From 68db8d0201c397291e1abf1999f5deb748cf0241 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 5 Dec 2023 15:38:15 +0100 Subject: [PATCH 3/5] install libomp --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d14f2649..025ce5504 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,7 +175,7 @@ jobs: rm /usr/local/bin/python3-config || true rm /usr/local/bin/python3.11-config || true - brew install hdf5 c-blosc + brew install hdf5 c-blosc libomp python -m pip install --upgrade pip wheel export LD_LIBRARY_PATH=${HOME}/dependencies/lib:$LD_LIBRARY_PATH export TA_LIBRARY_PATH=${HOME}/dependencies/lib From 3c48208b3190afb25a7e164a0969288de430a4bd Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 5 Dec 2023 18:07:08 +0100 Subject: [PATCH 4/5] Fix cache keys --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 025ce5504..de823e9dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,14 +143,14 @@ jobs: id: cache with: path: ~/dependencies/ - key: ${{ runner.os }}-${{ env.ImageOS }}-dependencies + key: ${{ matrix.os }}-dependencies - name: pip cache (macOS) uses: actions/cache@v3 if: runner.os == 'macOS' with: path: ~/Library/Caches/pip - key: test-${{ matrix.os }}-${{ matrix.python-version }}-pip + key: ${{ matrix.os }}-${{ matrix.python-version }}-pip - name: TA binary *nix if: steps.cache.outputs.cache-hit != 'true' From 9a425af76f67a1a838fcf3edd001138a7d9f398e Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 5 Dec 2023 18:08:00 +0100 Subject: [PATCH 5/5] Remove unnecessary conditions in Ci run --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de823e9dd..3a1eca7a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -147,7 +147,6 @@ jobs: - name: pip cache (macOS) uses: actions/cache@v3 - if: runner.os == 'macOS' with: path: ~/Library/Caches/pip key: ${{ matrix.os }}-${{ matrix.python-version }}-pip @@ -158,7 +157,6 @@ jobs: cd build_helpers && ./install_ta-lib.sh ${HOME}/dependencies/; cd .. - name: Installation - macOS - if: runner.os == 'macOS' run: | # brew update # TODO: Should be the brew upgrade