Commit 92c4948 1 parent 0affccc commit 92c4948 Copy full SHA for 92c4948
File tree 5 files changed +50
-19
lines changed
5 files changed +50
-19
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,10 @@ set -e
21
21
22
22
declare -A archs
23
23
archs=([amd64]=x86_64
24
- [arm64v8]=aarch64)
24
+ [arch64]=aarch64
25
+ [arm64]=aarch64
26
+ [arm64v8]=aarch64
27
+ [x86_64]=x86_64)
25
28
26
29
declare -A platforms
27
30
platforms=([linux]=linux
@@ -38,5 +41,25 @@ platform=${platforms[$2]}
38
41
version=$3
39
42
prefix=$4
40
43
41
- url=" https://github.com/Kitware/CMake/releases/download/v${version} /cmake-${version} -${platform} -${arch} .tar.gz"
42
- wget -q ${url} -O - | tar -xzf - --directory ${prefix} --strip-components=1
44
+ mkdir -p ${prefix}
45
+ url=" https://github.com/Kitware/CMake/releases/download/v${version} /cmake-${version} -${platform} -"
46
+ case ${platform} in
47
+ macos)
48
+ url+=" universal.tar.gz"
49
+ curl -L ${url} | tar -xzf - --directory ${prefix} --strip-components=1
50
+ ln -s CMake.app/Contents/bin ${prefix} /bin
51
+ ;;
52
+ windows)
53
+ url+=" ${arch} .zip"
54
+ archive_name=$( basename ${url} )
55
+ curl -L -o ${archive_name} ${url}
56
+ unzip ${archive_name}
57
+ base_name=$( basename ${archive_name} .zip)
58
+ mv ${base_name} /* ${prefix}
59
+ rm -rf ${base_name} ${archive_name}
60
+ ;;
61
+ * )
62
+ url+=" ${arch} .tar.gz"
63
+ curl -L ${url} | tar -xzf - --directory ${prefix} --strip-components=1
64
+ ;;
65
+ esac
Original file line number Diff line number Diff line change 59
59
60
60
{% - macro github_install_archery () -%}
61
61
- name: Set up Python by actions/setup-python
62
- if: runner.arch == 'X64'
62
+ if: |
63
+ !(runner.os == 'Linux' && runner.arch != 'X64')
63
64
uses: actions/setup-python@v4
64
65
with:
65
66
cache: 'pip'
86
87
87
88
{% - macro github_upload_releases (pattern ) -%}
88
89
- name: Set up Python by actions/setup-python
89
- if: runner.arch == 'X64'
90
+ if: |
91
+ !(runner.os == 'Linux' && runner.arch != 'X64')
90
92
uses: actions/setup-python@v4
91
93
with:
92
94
python-version: 3.12
Original file line number Diff line number Diff line change 50
50
run : |
51
51
brew list
52
52
53
+ # CMake 3.29.1 that is pre-installed on the macOS image has a problem.
54
+ # See also: https://github.com/microsoft/vcpkg/issues/37968
55
+ - name : Install CMake 3.29.0
56
+ shell : bash
57
+ run : |
58
+ arrow/ci/scripts/install_cmake.sh $(arch) macos 3.29.0 ${PWD}/local
59
+ echo "${PWD}/local/bin" >> $GITHUB_PATH
60
+
53
61
- name : Retrieve VCPKG version from arrow/.env
54
62
run : |
55
63
vcpkg_version=$(cat "arrow/.env" | grep "VCPKG" | cut -d "=" -f2 | tr -d '"')
Original file line number Diff line number Diff line change @@ -78,7 +78,8 @@ cmake --build . --target INSTALL --config Release || exit /B 1
78
78
79
79
@ rem Test Arrow C++ library
80
80
81
- ctest --output-on-failure ^
81
+ ctest --build-config Release ^
82
+ --output-on-failure ^
82
83
--parallel %NUMBER_OF_PROCESSORS% ^
83
84
--timeout 300 || exit /B 1
84
85
Original file line number Diff line number Diff line change 15
15
# specific language governing permissions and limitations
16
16
# under the License.
17
17
18
- # NOTE: must set "Crossbow" as name to have the badge links working in the
19
- # github comment reports!
20
- name : Crossbow
18
+ {% import 'macros.jinja' as macros with context %}
21
19
22
- on :
23
- push :
24
- branches :
25
- - " *-github-*"
20
+ {{ macros.github_header() }}
26
21
27
22
jobs :
28
23
test-vcpkg-win :
@@ -31,12 +26,14 @@ jobs:
31
26
env :
32
27
VCPKG_BINARY_SOURCES : ' clear;nuget,GitHub,readwrite'
33
28
steps :
34
- - name : Checkout Arrow
29
+ {{ macros.github_checkout_arrow()|indent }}
30
+ # CMake 3.29.1 that is pre-installed on the Windows image has a problem.
31
+ # See also: https://github.com/microsoft/vcpkg/issues/37968
32
+ - name : Install CMake 3.29.0
33
+ shell : bash
35
34
run : |
36
- git clone --no-checkout {{ arrow.remote }} arrow
37
- git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
38
- git -C arrow checkout FETCH_HEAD
39
- git -C arrow submodule update --init --recursive
35
+ arrow/ci/scripts/install_cmake.sh amd64 windows 3.29.0 /c/cmake
36
+ echo "c:\\cmake\\bin" >> $GITHUB_PATH
40
37
- name : Download Timezone Database
41
38
shell : bash
42
39
run : arrow/ci/scripts/download_tz_database.sh
59
56
CALL setx PATH "%PATH%;C:\vcpkg"
60
57
- name : Setup NuGet Credentials
61
58
shell : bash
62
- env :
59
+ env :
63
60
GITHUB_TOKEN : {{ '${{ secrets.GITHUB_TOKEN }}' }}
64
61
run : |
65
62
`vcpkg fetch nuget | tail -n 1` \
You can’t perform that action at this time.
0 commit comments