Skip to content

Commit bdb73be

Browse files
committed
Remove windows tz workarounds
1 parent 58fac16 commit bdb73be

37 files changed

+16
-404
lines changed

.github/workflows/cpp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,9 @@ jobs:
348348
with:
349349
fetch-depth: 0
350350
submodules: recursive
351+
- name: Download Timezone Database
352+
shell: bash
353+
run: ci/scripts/download_tz_database.sh
351354
- uses: msys2/setup-msys2@v2
352355
with:
353356
msystem: ${{ matrix.msystem_upper }}
@@ -366,9 +369,6 @@ jobs:
366369
run: |
367370
export CMAKE_BUILD_PARALLEL_LEVEL=$NUMBER_OF_PROCESSORS
368371
ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build"
369-
- name: Download Timezone Database
370-
shell: bash
371-
run: ci/scripts/download_tz_database.sh
372372
- name: Download MinIO
373373
shell: msys2 {0}
374374
run: |

.github/workflows/cpp_extra.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,6 @@ jobs:
365365
with:
366366
fetch-depth: 0
367367
submodules: recursive
368-
- name: Download Timezone Database
369-
shell: bash
370-
run: ci/scripts/download_tz_database.sh
371368
- name: Install cmake
372369
shell: bash
373370
run: |

.github/workflows/cpp_windows.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ jobs:
8181
with:
8282
fetch-depth: 0
8383
submodules: recursive
84-
- name: Download Timezone Database
85-
shell: bash
86-
run: ci/scripts/download_tz_database.sh
8784
- name: Install msys2 (for tzdata for ORC tests)
8885
uses: msys2/setup-msys2@v2
8986
id: setup-msys2

.github/workflows/matlab.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ jobs:
147147
uses: matlab-actions/setup-matlab@v2
148148
with:
149149
release: R2025b
150-
- name: Download Timezone Database
151-
shell: bash
152-
run: ci/scripts/download_tz_database.sh
153150
- name: Install ccache
154151
shell: bash
155152
run: ci/scripts/install_ccache.sh 4.6.3 /usr

.github/workflows/verify_rc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,6 @@ jobs:
228228
run: |
229229
choco install --no-progress --yes boost-msvc-14.1
230230
choco install --no-progress --yes wget
231-
- name: Download Timezone Database
232-
shell: bash
233-
run: ci/scripts/download_tz_database.sh
234231
- name: Run verification
235232
env:
236233
GH_TOKEN: ${{ github.token }}

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

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

4747
def test_assume_timezone_function
48-
omit("Missing tzdata on Windows") if Gem.win_platform?
4948
args = [
5049
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190000])),
5150
]

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ 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?
4342
args = [
4443
# 2017-09-09T10:33:10Z (Saturday)
4544
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190000])),
@@ -51,7 +50,6 @@ def test_day_of_week_function_with_count_from_zero_false
5150
end
5251

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

c_glib/test/test-strftime-options.rb

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

3737
def test_strftime_function
38-
omit("Missing tzdata on Windows") if Gem.win_platform?
3938
args = [
4039
Arrow::ArrayDatum.new(build_timestamp_array(:milli, [1504953190854])),
4140
]

ci/scripts/download_tz_database.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
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+
2023
set -ex
2124

2225
# Download database

cpp/src/arrow/compute/function_test.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,9 @@ TEST(FunctionOptions, Equality) {
9595
options.emplace_back(new StrptimeOptions("%Y", TimeUnit::type::MILLI, true));
9696
options.emplace_back(new StrptimeOptions("%Y", TimeUnit::type::NANO));
9797
options.emplace_back(new StrftimeOptions("%Y-%m-%dT%H:%M:%SZ", "C"));
98-
#ifndef _WIN32
9998
options.emplace_back(new AssumeTimezoneOptions(
10099
"Europe/Amsterdam", AssumeTimezoneOptions::Ambiguous::AMBIGUOUS_RAISE,
101100
AssumeTimezoneOptions::Nonexistent::NONEXISTENT_RAISE));
102-
#endif
103101
options.emplace_back(new PadOptions(5, " "));
104102
options.emplace_back(new PadOptions(10, "A"));
105103
options.emplace_back(new PadOptions(10, "A", false));

0 commit comments

Comments
 (0)