Skip to content

Commit d0c9a21

Browse files
committed
work
1 parent f1661be commit d0c9a21

File tree

6 files changed

+10
-14
lines changed

6 files changed

+10
-14
lines changed

.github/workflows/cpp.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -366,18 +366,13 @@ jobs:
366366
run: |
367367
export CMAKE_BUILD_PARALLEL_LEVEL=$NUMBER_OF_PROCESSORS
368368
ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build"
369-
- name: Download Timezone Database for vendored date library (Clang64)
369+
- name: Download Timezone Database
370370
if: matrix.msystem_upper == 'CLANG64'
371-
shell: msys2 {0}
371+
shell: bash
372372
run: |
373373
# TODO(GH-48743): Clang64 uses vendored date library which needs tzdata
374374
# https://github.com/apache/arrow/issues/48743
375-
mkdir -p /c/Users/runneradmin/Downloads/tzdata
376-
curl -sL https://data.iana.org/time-zones/releases/tzdata2024b.tar.gz | \
377-
tar -xz -C /c/Users/runneradmin/Downloads/tzdata
378-
# Also need windowsZones.xml from Unicode CLDR for Windows timezone mapping
379-
curl -sL -o /c/Users/runneradmin/Downloads/tzdata/windowsZones.xml \
380-
https://raw.githubusercontent.com/unicode-org/cldr/main/common/supplemental/windowsZones.xml
375+
ci/scripts/download_tz_database.sh
381376
- name: Download MinIO
382377
shell: msys2 {0}
383378
run: |

c_glib/test/test-assume-timezone-options.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def test_nonexistent_property
4545
end
4646

4747
def test_assume_timezone_function
48+
omit("Missing tzdata on Windows") if Gem.win_platform?
4849
args = [
4950
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190000])),
5051
]

c_glib/test/test-day-of-week-options.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def test_week_start_property
3939
end
4040

4141
def test_day_of_week_function_with_count_from_zero_false
42+
omit("Missing tzdata on Windows") if Gem.win_platform?
4243
args = [
4344
# 2017-09-09T10:33:10Z (Saturday)
4445
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190000])),
@@ -50,6 +51,7 @@ def test_day_of_week_function_with_count_from_zero_false
5051
end
5152

5253
def test_day_of_week_function_with_week_start
54+
omit("Missing tzdata on Windows") if Gem.win_platform?
5355
args = [
5456
# 2017-09-09T10:33:10Z (Saturday)
5557
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190000])),

c_glib/test/test-strftime-options.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def test_locale_property
3535
end
3636

3737
def test_strftime_function
38+
omit("Missing tzdata on Windows") if Gem.win_platform?
3839
args = [
3940
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190854])),
4041
]

ci/scripts/download_tz_database.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
# Downloads IANA timezone database for use with the vendored date library
21-
# on Windows when not using MSVC (e.g., MinGW builds).
22-
2320
set -ex
2421

2522
# Download database

r/src/arrowExports.cpp

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)