Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docs
on:
push:
branches:
- master
- _disabled
pull_request:
paths:
- '**.md'
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: lint
on: [pull_request]
on:
pull_request:
branches:
- _disabled

jobs:
changelog:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- ".tx"
- ".git*"
branches:
- master
- _disabled
pull_request:
paths-ignore:
- "*.md"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/mingw-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Valhalla MinGW Build
on: [pull_request]
on:
pull_request:
branches:
- _disabled

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs_bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- ".tx"
- ".git*"
branches:
- master
- _disabled
tags:
- '*'
# on PRs we only build it if we touch the bindings themselves or the actor.h file (i.e. if we change the API used by bindings)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/osx_win_python_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- ".tx"
- ".git*"
branches:
- master
- _disabled
tags:
- '*'
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_tz_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- cron: "0 0 1 */2 *" # every 2 months
push:
branches:
- master
- _disabled
paths:
- scripts/valhalla_build_timezones
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_public_servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update public FOSSGIS servers
on:
push:
branches:
- master
- _disabled
paths:
- '.github/workflows/**'
- 'src/**'
Expand Down
21 changes: 13 additions & 8 deletions docker/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,19 @@ RUN mkdir -p build/src/valhalla/proto && \
--cpp_out=build/src/valhalla/proto \
proto/*.proto

# ── Step C: Ensure libvalhalla.so.3 and libvalhalla.so exist in resources ───
# Symlinks are stripped by NTFS on Windows hosts — copy versioned file under
# all three names so Gradle bundles all entries into the JAR.
# Version 3.6.2 confirmed from valhalla/valhalla.h.
RUN cd src/bindings/java/src/main/resources/lib/linux-amd64 && \
cp -n libvalhalla.so.3.6.2 libvalhalla.so.3 && \
cp -n libvalhalla.so.3.6.2 libvalhalla.so && \
ls -la
# ── Step C: Populate libvalhalla.so* in resources from the build output ─────
# *.so / *.so.* are gitignored so they are absent from the build context.
# Copy the versioned library built in Step A (installed to /usr/local/lib/)
# under all three names so Gradle bundles all entries into the JAR.
RUN DEST=src/bindings/java/src/main/resources/lib/linux-amd64 && \
VERSIONED=$(ls /usr/local/lib/libvalhalla.so.[0-9]* 2>/dev/null | sort -V | tail -1) && \
if [ -z "$VERSIONED" ]; then echo "❌ libvalhalla.so.* not found in /usr/local/lib/" && exit 1; fi && \
SONAME=$(basename "$VERSIONED") && \
cp "$VERSIONED" "$DEST/$SONAME" && \
cp "$VERSIONED" "$DEST/libvalhalla.so.3" && \
cp "$VERSIONED" "$DEST/libvalhalla.so" && \
echo "✅ $SONAME copied as libvalhalla.so.3 and libvalhalla.so" && \
ls -la "$DEST"

# ── Step D: Build native JNI library with CMake ──────────────────────────────
# Runs from src/bindings/java/ — cmake -S . points at src/bindings/java/CMakeLists.txt
Expand Down
Loading