Merge pull request #50 from JanCaha/development

Development

Author: JanCaha

.github/workflows/create_releases.yaml

@@ -191,22 +191,6 @@ jobs:
             echo "VERSION=$(grep "project(" CMakeLists.txt | grep -E -o -e "[0-9\.]+")" >> $GITHUB_ENV
             echo "VERSION=$(grep "project(" CMakeLists.txt | grep -E -o -e "[0-9\.]+")" >> $GITHUB_OUTPUT
         
-        - name: Build and push Docker image version
-          uses: docker/build-push-action@v4
-          with:
-            file: docker/Dockerfile
-            context: docker/
-            push: true
-            tags: "cahik/viewshed:v${{steps.version.outputs.VERSION}}"
-
-        - name: Build and push Docker image latest
-          uses: docker/build-push-action@v4
-          with:
-            file: docker/Dockerfile
-            context: docker/
-            push: true
-            tags: cahik/viewshed:latest
-        
         - name: Download artifact WHL
           uses: actions/download-artifact@v4
           with:
@@ -222,15 +206,15 @@ jobs:
             file: docker/viewshed_install_from_ppa.dockerfile
             context: docker/
             push: true
-            tags: "cahik/viewshed:v${{steps.version.outputs.VERSION}}-python"
+            tags: "cahik/viewshed:v${{steps.version.outputs.VERSION}}"
 
         - name: Build and push Docker image latest with Python
           uses: docker/build-push-action@v4
           with:
             file: docker/viewshed_install_from_ppa.dockerfile
             context: docker/
             push: true
-            tags: cahik/viewshed:latest-python
+            tags: cahik/viewshed:latest
 
   Release-to-PPA:
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20.0)
 
-project(viewshed VERSION 4.0.3 DESCRIPTION "C++ Viewshed library based on GDAL and Qt" LANGUAGES CXX)
+project(viewshed VERSION 4.1.0 DESCRIPTION "C++ Viewshed library based on GDAL and Qt" LANGUAGES CXX)
 
 SET(LIBRARY_NAME "viewshed")
 

README.md

@@ -113,12 +113,12 @@ apt-get -y install simplerasters viewshed viewshed-bin
 If you use the library, please cite it accordingly:
 
 ```bibtex
-@Software{Caha2023,
+@Software{Caha2024,
   author  = {Jan Caha},
   title   = {viewshed ({C++ Viewshed library based on GDAL and Qt})},
-  year    = {2023},
-  date    = {2023-07-11},
-  version = {2.7.0},
+  year    = {2024},
+  date    = {2024-07-11},
+  version = {4.0.3},
   url     = {https://github.com/JanCaha/cpp-viewshed-library},
 }
 ```

debian/changelog

@@ -1,3 +1,9 @@
+viewshed (4.1.0) jammy; urgency=low
+  
+  * change numbering for ppa
+
+ -- Jan Caha <[email protected]>  Thu, 29 Aug 2024 11:28:48 +0200
+
 viewshed (4.0.3-0) jammy; urgency=low
 
   * fix segmentation fault for some scenarios