From 4c2e698ed9376235899137a9a4bca3055ab98320 Mon Sep 17 00:00:00 2001 From: nameexhaustion Date: Tue, 27 Feb 2024 23:17:16 +1100 Subject: [PATCH 1/3] build(rust): Limit cmake therads to fix crash compiling `libz-ng-sys` on macOS --- .github/workflows/codecov.yml | 1 + .github/workflows/release-python.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 60cd176c6d70..bfb9958736a9 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -32,6 +32,7 @@ jobs: CARGO_LLVM_COV: 1 CARGO_LLVM_COV_SHOW_ENV: 1 CARGO_LLVM_COV_TARGET_DIR: '/Users/runner/work/polars/polars/target' + CMAKE_BUILD_PARALLEL_LEVEL: 10 # fix resource temporarily unavailable on macOS for libz-ng-sys (https://github.com/pola-rs/polars/pull/14715) steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index ac1a272746eb..d29f9d799059 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -95,6 +95,7 @@ jobs: env: SED_INPLACE: ${{ matrix.os == 'macos-latest' && '-i ''''' || '-i'}} CPU_CHECK_MODULE: py-polars/polars/_cpu_check.py + CMAKE_BUILD_PARALLEL_LEVEL: 10 # fix resource temporarily unavailable on macOS for libz-ng-sys (https://github.com/pola-rs/polars/pull/14715) steps: - uses: actions/checkout@v4 From 570bb17e2c3a41891e8379cb7f9b9a4f1f004b42 Mon Sep 17 00:00:00 2001 From: Stijn de Gooijer Date: Tue, 27 Feb 2024 14:29:01 +0100 Subject: [PATCH 2/3] Only set environment variable for MacOS --- .github/workflows/codecov.yml | 4 +++- .github/workflows/release-python.yml | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index bfb9958736a9..a214d57bf8af 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -32,7 +32,9 @@ jobs: CARGO_LLVM_COV: 1 CARGO_LLVM_COV_SHOW_ENV: 1 CARGO_LLVM_COV_TARGET_DIR: '/Users/runner/work/polars/polars/target' - CMAKE_BUILD_PARALLEL_LEVEL: 10 # fix resource temporarily unavailable on macOS for libz-ng-sys (https://github.com/pola-rs/polars/pull/14715) + # Workaround for issue compiling libz-ng-sys crate on macOS (resource temporarily unavailable) + # See: https://github.com/pola-rs/polars/pull/14715 + CMAKE_BUILD_PARALLEL_LEVEL: 10 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index d29f9d799059..87c5803c5a28 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -95,7 +95,6 @@ jobs: env: SED_INPLACE: ${{ matrix.os == 'macos-latest' && '-i ''''' || '-i'}} CPU_CHECK_MODULE: py-polars/polars/_cpu_check.py - CMAKE_BUILD_PARALLEL_LEVEL: 10 # fix resource temporarily unavailable on macOS for libz-ng-sys (https://github.com/pola-rs/polars/pull/14715) steps: - uses: actions/checkout@v4 @@ -109,6 +108,12 @@ jobs: with: swap-size-gb: 10 + # Workaround for issue compiling libz-ng-sys crate on macOS (resource temporarily unavailable) + # See: https://github.com/pola-rs/polars/pull/14715 + - name: Set cmake build threads for MacOS + if: matrix.os == 'macos-latest' + run: echo "CMAKE_BUILD_PARALLEL_LEVEL=10" >> $GITHUB_ENV + - name: Set up Python uses: actions/setup-python@v5 with: From 73f7ceedc13fadd499338c71de242e9a093e91a0 Mon Sep 17 00:00:00 2001 From: Stijn de Gooijer Date: Tue, 27 Feb 2024 14:29:45 +0100 Subject: [PATCH 3/3] Driveby trigger change --- .github/workflows/codecov.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index a214d57bf8af..7e8c2353c5e5 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -5,12 +5,14 @@ on: paths: - '**.rs' - '**.py' + - .github/workflows/codecov.yml push: branches: - main paths: - '**.rs' - '**.py' + - .github/workflows/codecov.yml concurrency: group: ${{ github.workflow }}-${{ github.ref }}