Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
f5b8d08
disable mimalloc
Ylannl Jul 7, 2025
e021512
enable a pure nix build
Ylannl Aug 6, 2025
fdd6311
start work on nix build support
Ylannl Aug 6, 2025
e0202f5
use official nixpkgs-unstable
Ylannl Aug 25, 2025
496615f
simplify version reporting
Ylannl Aug 29, 2025
ce94c4a
first nix build success
Ylannl Aug 29, 2025
9581f0b
nix: fix self.dirtyShortRev not found error
Ylannl Aug 31, 2025
ca4f056
improve version cli reporting
Ylannl Sep 1, 2025
aa78a12
auto bump version.hpp
Ylannl Sep 1, 2025
59213b0
add cmake fallback for populating RF_GIT_HASH
Ylannl Sep 1, 2025
9e85496
clean up a flake.nix
Ylannl Sep 1, 2025
55235ec
nix develop: make build work with val3dity
Ylannl Sep 2, 2025
6a67219
further cleanup flake.nix
Ylannl Sep 2, 2025
29e7e37
refine flake.nix
Ylannl Sep 2, 2025
f42c01b
nix build: first steps integrating val3dity
Ylannl Sep 5, 2025
fa8f453
nix build with val3dity working
Ylannl Sep 5, 2025
6c1c546
add nix based dockerfile
Ylannl Sep 6, 2025
964da4a
add nix based dockerfile: set entrypoint
Ylannl Sep 6, 2025
5e4c4c9
flake.nix: add dockerTools output
Ylannl Sep 8, 2025
12c6b52
wip doc-helper
balazsdukai Sep 15, 2025
9617c1b
fix doc-helper build error
Ylannl Sep 15, 2025
b79b98c
update flake to build with rerun
Ylannl Dec 18, 2025
ceb5ba4
Merge branch 'develop' into nix
Ylannl Feb 24, 2026
a726348
add conan build support
Ylannl Feb 24, 2026
7936b44
print conan build steps + add patchelf on linux
Ylannl Feb 25, 2026
4ea122b
undo mimalloc static to keep nix build going
Ylannl Feb 25, 2026
1d0ff44
Merge branch 'develop' into nix
Ylannl Feb 25, 2026
2dd0304
merge no-mimalloc
Ylannl Mar 11, 2026
5226b65
conan based build action
Ylannl Mar 11, 2026
478eff3
set conan profile cppstd=20
Ylannl Mar 11, 2026
b4a7526
conan: include laslib
Ylannl Mar 12, 2026
65a15fa
disable docker ci
Ylannl Mar 12, 2026
afa4b3c
bundle gdal/proj data, remove macos bundle step
Ylannl Mar 12, 2026
d0f18e5
update actions versions
Ylannl Mar 12, 2026
aa68d33
conan build ci: add testing
Ylannl Mar 12, 2026
7430e80
update dockerfile to use conan
Ylannl Mar 12, 2026
9d1ed1d
conan build ci: enable testing
Ylannl Mar 12, 2026
de0ceab
fix test, enable docker ci
Ylannl Mar 12, 2026
c060269
conan co: enable test_install
Ylannl Mar 12, 2026
89ab1bf
update changelog
Ylannl Mar 12, 2026
9369792
fix install test
Ylannl Mar 12, 2026
9f1363a
nix build: add proj,sqlite
Ylannl Mar 22, 2026
2eae801
fix conan build on nixos
Ylannl Mar 24, 2026
f576262
Merge branch 'develop' into nix-nomimalloc
Ylannl Mar 31, 2026
358a8ee
use cmakeCurses for conan dev shell
Ylannl Apr 17, 2026
1d5a860
remove vcpkg references
Ylannl Apr 17, 2026
6c309af
refactor build workflows, switch over docs flow to conan
Ylannl Apr 17, 2026
12b45ac
update build instructions to use conan/nix, not vcpkg
Ylannl Apr 17, 2026
b4cac49
use build presets for gh runners, test doc workflow
Ylannl Apr 17, 2026
86e0961
fix sytax error in cmakePresets
Ylannl Apr 17, 2026
e883ef3
fix CI error
Ylannl Apr 17, 2026
c964e0a
attempt to fix ubunut 22 runner build
Ylannl Apr 17, 2026
44c0550
switch back to ubuntu 24 gh runner
Ylannl Apr 17, 2026
3cee9fd
fixes for doc workflow
Ylannl Apr 17, 2026
337d215
simplify and improve build/workflows
Ylannl Apr 17, 2026
9ea7c1b
fix docs workflow
Ylannl Apr 17, 2026
1ae4dac
dont fail on lint error
Ylannl Apr 17, 2026
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
7 changes: 6 additions & 1 deletion .bumpversion.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "1.0.0-beta.5"
current_version = "1.0.0-beta.7"
parse = """(?x)
(?P<major>0|[1-9]\\d*)\\.
(?P<minor>0|[1-9]\\d*)\\.
Expand Down Expand Up @@ -64,3 +64,8 @@ filename = "CMakeLists.txt"
serialize = ["{major}.{minor}.{patch}"]
search = "project(roofer VERSION {current_version}"
replace = "project(roofer VERSION {new_version}"

[[tool.bumpversion.files]]
filename = "apps/roofer-app/version.hpp"
search = "RF_VERSION \"{current_version}\""
replace = "RF_VERSION \"{new_version}\""
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@

docs
experiments
external/vcpkg
external/val3dity
tests
vcpkg_installed
29 changes: 26 additions & 3 deletions .github/workflows/build-push-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,53 @@ on:
paths-ignore:
- "**.md"
- "**.rst"
branches:
- develop
pull_request:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5

- name: Set docker image tag to 'develop'
run: echo "DOCKER_TAG=develop" >> $GITHUB_ENV

- name: Set docker image tag to git tag
if: startsWith(github.ref, 'refs/tags/v')
run: echo "DOCKER_TAG=${{ github.ref_name }}" >> $GITHUB_ENV

- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3

- name: Build
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v6
with:
context: ./
file: ./docker/Dockerfile
builder: ${{ steps.buildx.outputs.name }}
build-args: |
JOBS=2
VERSION=${{ env.DOCKER_TAG }}
push: false
tags: 3dgi/roofer:${{ env.DOCKER_TAG }}
cache-from: type=registry,ref=3dgi/roofer:buildcache

- name: Build and push
if: github.event_name != 'pull_request'
uses: docker/build-push-action@v6
with:
context: ./
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/build_install_conan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Build and Install (Conan)

on:
push:
tags:
- "v*"
pull_request:
branches: ["develop"]
workflow_dispatch:

permissions:
contents: read

jobs:
build:
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-24.04
build_type: Release
build_jobs: 4
- os: windows-2022
build_type: Release
build_jobs: 4
- os: macos-15
build_type: Release
build_jobs: 3
uses: ./.github/workflows/conan-build.yml
with:
runs_on: ${{ matrix.os }}
build_type: ${{ matrix.build_type }}
build_jobs: ${{ matrix.build_jobs }}
build_apps: true
use_spdlog: true
use_val3dity: false
build_bindings: false
build_testing: true
build_doc_helper: false
run_tests: true
artifact_suffix: build
232 changes: 0 additions & 232 deletions .github/workflows/build_install_test_vcpkg.yml

This file was deleted.

Loading
Loading