From 583310290cf6fb5a841489aa5e12f7ac6036ac59 Mon Sep 17 00:00:00 2001 From: Benedikt Schwab Date: Mon, 20 Nov 2023 20:26:07 +0100 Subject: [PATCH 1/3] added basic build ci workflow --- .github/workflows/build-citydb-tool.yml | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/build-citydb-tool.yml diff --git a/.github/workflows/build-citydb-tool.yml b/.github/workflows/build-citydb-tool.yml new file mode 100644 index 00000000..2b69d121 --- /dev/null +++ b/.github/workflows/build-citydb-tool.yml @@ -0,0 +1,28 @@ +name: Build citydb-tool + +on: [push, pull_request] + +jobs: + build: + runs-on: ${{matrix.os}}-latest + strategy: + matrix: + os: ['ubuntu', 'windows'] + java: [ '11' ] + distribution: [ 'temurin' ] + fail-fast: false + + steps: + - name: "Checkout" + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: "Set up Java" + uses: actions/setup-java@v3 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + - name: "Grant execute permission for gradlew" + run: chmod +x ./gradlew + - name: "Build with Gradle" + run: ./gradlew build From 4739216dfe12ea7296c8eca74a0d87b0a002ce87 Mon Sep 17 00:00:00 2001 From: Benedikt Schwab Date: Tue, 21 Nov 2023 09:28:59 +0100 Subject: [PATCH 2/3] added ci build badge --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da0805c4..baa751c5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![Gradle build](https://img.shields.io/github/actions/workflow/status/3dcitydb/citydb-tool/build-citydb-tool.yml?logo=Gradle&logoColor=white&style=flat-square) + # citydb-tool 3D City Database 5.0 CLI to import/export city model data and to run database operations @@ -63,4 +65,4 @@ The script automatically downloads all required dependencies for building and ru are connected to the internet. The build process runs on all major operating systems and only requires a Java 11 JDK or higher to run. -If the build was successful, you will find the citydb-tool package under `citydb-cli/build/install`. \ No newline at end of file +If the build was successful, you will find the citydb-tool package under `citydb-cli/build/install`. From aa3f197be33547bb31fca5cf8b8051392825ea70 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Wed, 22 Nov 2023 08:18:30 +0100 Subject: [PATCH 3/3] fixed reading multiple files from a single ZIP --- .../java/org/citydb/core/file/input/ZipInputFile.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/citydb-core/src/main/java/org/citydb/core/file/input/ZipInputFile.java b/citydb-core/src/main/java/org/citydb/core/file/input/ZipInputFile.java index 09f25bd7..422acc9f 100644 --- a/citydb-core/src/main/java/org/citydb/core/file/input/ZipInputFile.java +++ b/citydb-core/src/main/java/org/citydb/core/file/input/ZipInputFile.java @@ -76,6 +76,14 @@ public URI getFileURI() { } private FileSystem getFileSystem() { + if (fileSystem == null) { + try { + fileSystem = FileSystems.getFileSystem(fileURI); + } catch (Throwable e) { + // + } + } + if (fileSystem == null) { try { fileSystem = FileSystems.newFileSystem(fileURI, Collections.emptyMap());