Skip to content

Commit 5464d33

Browse files
committed
fixing tests
1 parent 558caf5 commit 5464d33

6 files changed

Lines changed: 20 additions & 234 deletions

File tree

.github/actions/manylinux_2014_setup/action.yml

Lines changed: 0 additions & 111 deletions
This file was deleted.

.github/actions/ubuntu_18_setup/action.yml

Lines changed: 0 additions & 100 deletions
This file was deleted.

.github/workflows/Java.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ jobs:
3838
fetch-depth: 0
3939
ref: ${{ inputs.git_ref }}
4040

41-
# - uses: ./.github/actions/manylinux_2014_setup
42-
# with:
43-
# ninja-build: 1
44-
# ccache: 1
45-
# jdk: 1
46-
# python_alias: 1
47-
# aws-cli: 1
4841

4942
- name: Build
5043
shell: bash
@@ -55,11 +48,11 @@ jobs:
5548
-e CMAKE_BUILD_PARALLEL_LEVEL=2 \
5649
quay.io/pypa/manylinux2014_${{ matrix.config.image }} \
5750
bash -c "yum install -y java-1.8.0-openjdk-devel && git config --global --add safe.directory $PWD && make release -C $PWD"
58-
#
59-
# - name: Java Tests
60-
# shell: bash
61-
# if: ${{ inputs.skip_tests != 'true' }}
62-
# run: make test
51+
52+
- name: Java Tests
53+
shell: bash
54+
if: ${{ inputs.skip_tests != 'true' }}
55+
run: make test
6356

6457
- name: Deploy
6558
shell: bash

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Large diffs are not rendered by default.

CMakeLists.txt.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
cmake_minimum_required(VERSION 3.11.0)
2+
3+
project(DuckDBJava)
4+
15
find_package(Java 1.8)
26

37
set(JAVA_AWT_LIBRARY NotNeeded)
48
set(JAVA_JVM_LIBRARY NotNeeded)
59

610
find_package(JNI)
11+
find_package(Threads)
712

8-
cmake_minimum_required(VERSION 3.11.0)
913
set(CMAKE_CXX_STANDARD "11" CACHE STRING "C++ standard to enforce")
1014
set(CMAKE_VERBOSE_MAKEFILE OFF)
1115
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -15,7 +19,6 @@ if(NOT JNI_FOUND OR NOT Java_FOUND)
1519
endif()
1620

1721
include(UseJava)
18-
project(DuckDBJava)
1922

2023
include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
2124

src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,17 +348,17 @@
348348

349349
#include "extension/icu/third_party/icu/i18n/wintzimpl.cpp"
350350

351-
#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"
351+
#include "extension/icu/third_party/icu/i18n/double-conversion-fast-dtoa.cpp"
352352

353-
#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"
353+
#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
354354

355-
#include "extension/icu/third_party/icu/i18n/double-conversion-fast-dtoa.cpp"
355+
#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"
356356

357-
#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"
357+
#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"
358358

359359
#include "extension/icu/third_party/icu/i18n/double-conversion-bignum-dtoa.cpp"
360360

361-
#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
362-
363361
#include "extension/icu/third_party/icu/i18n/double-conversion-bignum.cpp"
364362

363+
#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"
364+

0 commit comments

Comments
 (0)