Skip to content

Commit c06c2f2

Browse files
committed
Fix for Cmake 3.xx installation
1 parent 67a7751 commit c06c2f2

14 files changed

Lines changed: 40 additions & 28 deletions

.github/workflows/pr_review_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: "Upload PR review Payload"
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
with:
3434
path: "${{ github.event_path }}"
3535
name: "pr_review_payload"

.github/workflows/r.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
if: always()
168168
- name: Save the test output
169169
if: always()
170-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
170+
uses: actions/upload-artifact@v4
171171
with:
172172
name: test-output
173173
path: r/check/arrow.Rcheck/tests/testthat.Rout*
@@ -229,7 +229,7 @@ jobs:
229229
if: always()
230230
- name: Save the test output
231231
if: always()
232-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
232+
uses: actions/upload-artifact@v4
233233
with:
234234
name: test-output
235235
path: r/check/arrow.Rcheck/tests/testthat.Rout*
@@ -291,7 +291,7 @@ jobs:
291291
# So that they're unique when multiple are downloaded in the next step
292292
shell: bash
293293
run: mv libarrow.zip libarrow-rtools${{ matrix.config.rtools }}-${{ matrix.config.arch }}.zip
294-
- uses: actions/upload-artifact@v3
294+
- uses: actions/upload-artifact@v4
295295
with:
296296
name: libarrow-rtools${{ matrix.config.rtools }}-${{ matrix.config.arch }}.zip
297297
path: libarrow-rtools${{ matrix.config.rtools }}-${{ matrix.config.arch }}.zip

dev/tasks/docker-tests/github.linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
done
6262
- name: Save the R test output
6363
if: always()
64-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: test-output
6767
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*

dev/tasks/java-jars/github.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Compress into single artifact to keep directory structure
7575
run: tar -cvzf arrow-shared-libs-linux-{{ arch }}.tar.gz arrow/java-dist/
7676
- name: Upload artifacts
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v4
7878
with:
7979
name: ubuntu-shared-lib-{{ arch }}
8080
path: arrow-shared-libs-linux-{{ arch }}.tar.gz
@@ -93,9 +93,9 @@ jobs:
9393
fail-fast: false
9494
matrix:
9595
platform:
96-
- { runs_on: ["macos-12"], arch: "x86_64"}
96+
- { runs_on: ["macos-13"], arch: "x86_64"}
9797
env:
98-
MACOSX_DEPLOYMENT_TARGET: "12.0"
98+
MACOSX_DEPLOYMENT_TARGET: "13.0"
9999
steps:
100100
{{ macros.github_checkout_arrow()|indent }}
101101
- name: Set up Python
@@ -138,6 +138,18 @@ jobs:
138138
# used on test We uninstall Homebrew's Protobuf to ensure using
139139
# bundled Protobuf.
140140
brew uninstall protobuf
141+
# fix cmake and boost versions
142+
brew uninstall -f boost || true
143+
brew uninstall -f cmake || true
144+
mkdir -p homebrew-custom/Formula
145+
curl -o homebrew-custom/Formula/cmake.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/f68532bfe5cb87474093df8a839c3818c6aa44dd/Formula/c/cmake.rb
146+
curl -o homebrew-custom/Formula/boost.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/23f9c56c5075dd56b4471e2c93f89f6400b49ddd/Formula/b/boost.rb
147+
brew install -v ./homebrew-custom/Formula/cmake.rb
148+
brew install -v ./homebrew-custom/Formula/boost.rb
149+
brew pin cmake
150+
brew pin boost
151+
#
152+
141153
142154
brew bundle --file=arrow/java/Brewfile
143155
- name: Build C++ libraries
@@ -154,7 +166,7 @@ jobs:
154166
- name: Compress into single artifact to keep directory structure
155167
run: tar -cvzf arrow-shared-libs-macos-{{ arch }}.tar.gz arrow/java-dist/
156168
- name: Upload artifacts
157-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
158170
with:
159171
name: macos-shared-lib-{{ arch }}
160172
path: arrow-shared-libs-macos-{{ arch }}.tar.gz
@@ -188,22 +200,22 @@ jobs:
188200
shell: bash
189201
run: tar -cvzf arrow-shared-libs-windows.tar.gz arrow/java-dist/
190202
- name: Upload artifacts
191-
uses: actions/upload-artifact@v3
203+
uses: actions/upload-artifact@v4
192204
with:
193205
name: windows-shared-lib
194206
path: arrow-shared-libs-windows.tar.gz
195207

196208
package-jars:
197209
name: Build jar files
198-
runs-on: macos-12
210+
runs-on: macos-13
199211
needs:
200212
- build-cpp-ubuntu
201213
- build-cpp-macos
202214
- build-cpp-windows
203215
steps:
204216
{{ macros.github_checkout_arrow(fetch_depth=0)|indent }}
205217
- name: Download Libraries
206-
uses: actions/download-artifact@v3
218+
uses: actions/download-artifact@v4
207219
with:
208220
path: artifacts
209221
- name: Decompress artifacts

dev/tasks/python-wheels/github.linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
shell: bash
4848
run: archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} python-wheel-manylinux-{{ manylinux_version }}
4949

50-
- uses: actions/upload-artifact@v3
50+
- uses: actions/upload-artifact@v4
5151
with:
5252
name: wheel
5353
path: arrow/python/repaired_wheels/*.whl

dev/tasks/python-wheels/github.osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
pip install --upgrade pip wheel
109109
PYTHON=python arrow/ci/scripts/python_wheel_macos_build.sh {{ arch }} $(pwd)/arrow $(pwd)/build
110110
111-
- uses: actions/upload-artifact@v3
111+
- uses: actions/upload-artifact@v4
112112
with:
113113
name: wheel
114114
path: arrow/python/repaired_wheels/*.whl

dev/tasks/python-wheels/github.windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
)
5959
archery docker run --no-build -e SETUPTOOLS_SCM_PRETEND_VERSION={{ arrow.no_rc_version }} python-wheel-windows-vs2019
6060
61-
- uses: actions/upload-artifact@v3
61+
- uses: actions/upload-artifact@v4
6262
with:
6363
name: wheel
6464
path: arrow/python/dist/*.whl

dev/tasks/r/github.devdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
EOF
6969
shell: bash -l {0}
7070
- name: Save the install script
71-
uses: actions/upload-artifact@v3
71+
uses: actions/upload-artifact@v4
7272
with:
7373
name: {{ "devdocs-script_os-${{ matrix.os }}_sysinstall-${{ matrix.system-install }}" }}
7474
path: arrow/r/vignettes/developers/script.sh

dev/tasks/r/github.linux.arrow.version.back.compat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
shell: bash
5959

6060
- name: Upload the parquet artifacts
61-
uses: actions/upload-artifact@v3
61+
uses: actions/upload-artifact@v4
6262
with:
6363
name: files
6464
path: arrow/r/extra-tests/files

dev/tasks/r/github.linux.cran.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
if: always()
5757
- name: Save the test output
5858
if: always()
59-
uses: actions/upload-artifact@v3
59+
uses: actions/upload-artifact@v4
6060
with:
6161
name: test-output
6262
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*

0 commit comments

Comments
 (0)