diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 69a0988eb8..966c42b1b7 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,7 +3,7 @@ name: Docs on: push: branches: - - master + - _disabled pull_request: paths: - '**.md' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2fe16a7453..626add9009 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,5 +1,8 @@ name: lint -on: [pull_request] +on: + pull_request: + branches: + - _disabled jobs: changelog: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f778a363a3..92b0a9c0c7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -14,7 +14,7 @@ on: - ".tx" - ".git*" branches: - - master + - _disabled pull_request: paths-ignore: - "*.md" diff --git a/.github/workflows/mingw-build.yml b/.github/workflows/mingw-build.yml index df4f781dce..77ab7c95d1 100644 --- a/.github/workflows/mingw-build.yml +++ b/.github/workflows/mingw-build.yml @@ -1,5 +1,8 @@ name: Valhalla MinGW Build -on: [pull_request] +on: + pull_request: + branches: + - _disabled jobs: build: diff --git a/.github/workflows/nodejs_bindings.yml b/.github/workflows/nodejs_bindings.yml index 71ecf3183d..2c466ba7ad 100644 --- a/.github/workflows/nodejs_bindings.yml +++ b/.github/workflows/nodejs_bindings.yml @@ -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) diff --git a/.github/workflows/osx_win_python_builds.yml b/.github/workflows/osx_win_python_builds.yml index 8b0d7e838a..6ff53348fd 100644 --- a/.github/workflows/osx_win_python_builds.yml +++ b/.github/workflows/osx_win_python_builds.yml @@ -17,7 +17,7 @@ on: - ".tx" - ".git*" branches: - - master + - _disabled tags: - '*' pull_request: diff --git a/.github/workflows/publish_tz_db.yml b/.github/workflows/publish_tz_db.yml index a59af58902..401592a470 100644 --- a/.github/workflows/publish_tz_db.yml +++ b/.github/workflows/publish_tz_db.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 1 */2 *" # every 2 months push: branches: - - master + - _disabled paths: - scripts/valhalla_build_timezones workflow_dispatch: diff --git a/.github/workflows/update_public_servers.yml b/.github/workflows/update_public_servers.yml index 775f982d38..7d149a96ac 100644 --- a/.github/workflows/update_public_servers.yml +++ b/.github/workflows/update_public_servers.yml @@ -3,7 +3,7 @@ name: Update public FOSSGIS servers on: push: branches: - - master + - _disabled paths: - '.github/workflows/**' - 'src/**' diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 4fdcb736c3..71899802ba 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -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