diff --git a/.devcontainer b/.devcontainer index 754ff59..f0e88b2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 754ff597cf9406625456b96d4f5b158aae39900e +Subproject commit f0e88b29cf1fc02f24a6aeae49750276231c920a diff --git a/.github/release-tag.yml b/.github/release-tag.yml new file mode 100644 index 0000000..51dd52e --- /dev/null +++ b/.github/release-tag.yml @@ -0,0 +1,2 @@ +tag: xpv5.1.0.7 +message: "xpro version 5.1.0.7 tag" diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 8d2fdec..fd31fce 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,12 +1,12 @@ -name: Build +name: xpBuild permissions: contents: read pull-requests: write on: push: - branches: [ "dev" ] + tags: ["xpv*"] pull_request: - branches: [ "dev" ] + branches: ["xpro"] workflow_dispatch: jobs: linux: @@ -14,17 +14,17 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.6 with: cmake-workflow-preset: LinuxRelease secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3 + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.6 with: cmake-workflow-preset: DarwinRelease secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.6 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index 86b6f88..a2eb282 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -1,4 +1,4 @@ -name: Release +name: xpRelease on: workflow_dispatch: inputs: @@ -6,10 +6,35 @@ on: description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)' required: true type: string + workflow_run: + workflows: ["xpBuild"] + types: [completed] jobs: + dispatch-at-tag: + if: >- + github.event_name == 'workflow_run' && + github.event.workflow_run.conclusion == 'success' && + startsWith(github.event.workflow_run.head_branch, 'xpv') + runs-on: ubuntu-latest + permissions: + actions: write + steps: + - + name: Dispatch xpRelease at tag + shell: bash + env: + GH_TOKEN: ${{ github.token }} + RUN_URL: ${{ github.event.workflow_run.html_url }} + TAG_REF: ${{ github.event.workflow_run.head_branch }} + run: | + set -euo pipefail + gh api -X POST "repos/${{ github.repository }}/actions/workflows/xprelease.yml/dispatches" \ + -f ref="$TAG_REF" \ + -f inputs[workflow_run_url]="$RUN_URL" # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3 + if: github.event_name == 'workflow_dispatch' + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.6 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml new file mode 100644 index 0000000..b5ce950 --- /dev/null +++ b/.github/workflows/xptag.yml @@ -0,0 +1,16 @@ +name: xpTag +permissions: + contents: write + issues: write +on: + pull_request: + types: [closed] +jobs: + tag: + if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }} + uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.6 + with: + merge_sha: ${{ github.event.pull_request.merge_commit_sha }} + pr_number: ${{ github.event.pull_request.number }} + secrets: + workflow_write_token: ${{ secrets.XPUPDATE_TOKEN }} diff --git a/xprodeps.md b/xprodeps.md new file mode 100644 index 0000000..276665a --- /dev/null +++ b/xprodeps.md @@ -0,0 +1,26 @@ +# spatialite-tools dependencies + +|project|license [^_l]|description [dependencies]|version|source|diff [^_d]| +|-------|-------------|--------------------------|-------|------|----------| +|[spatialite-tools](https://www.gaia-gis.it/fossil/spatialite-tools/index)|[GPL-3.0](https://www.gaia-gis.it/fossil/spatialite-tools/index 'GPL-3.0-or-later')|collection of open source Command Line Interface (CLI) tools supporting SpatiaLite [pvt deps: _libspatialite_]| | | [auto]| +|[libspatialite](https://www.gaia-gis.it/fossil/libspatialite/home)|[MPL-1.1](https://www.gaia-gis.it/fossil/libspatialite/home 'MPL tri-license: choose MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later')|extends capabilities of SQLite, enabling it to handle spatial data and perform spatial queries [deps: _geos, libiconv, sqlite3, zlib_]|[xpv5.1.0.8](https://github.com/externpro/libspatialite/releases/tag/xpv5.1.0.8 'release')|[repo](https://github.com/externpro/libspatialite 'github.com/externpro/libspatialite')|[diff](https://github.com/externpro/libspatialite/compare/5.1.0...xpv5.1.0.8 'github.com/externpro/libspatialite/compare/5.1.0...xpv5.1.0.8') [auto]| +|[geos](https://libgeos.org)|[LPGL-2.1](https://trac.osgeo.org/geos/ 'LGPL version 2.1')|C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software|[xpv3.13.0.6](https://github.com/externpro/geos/releases/tag/xpv3.13.0.6 'release')|[repo](https://github.com/externpro/geos 'github.com/externpro/geos') [upstream](https://github.com/libgeos/geos 'github.com/libgeos/geos')|[diff](https://github.com/externpro/geos/compare/3.13.0...xpv3.13.0.6 'github.com/externpro/geos/compare/3.13.0...xpv3.13.0.6') [patch]| +|[libiconv](https://www.gnu.org/software/libiconv/)|[LGPL-2.1](https://savannah.gnu.org/projects/libiconv/ 'LGPL version 2.1')|character set conversion library|[xpv1.18.8](https://github.com/externpro/libiconv/releases/tag/xpv1.18.8 'release')|[repo](https://github.com/externpro/libiconv 'github.com/externpro/libiconv') [upstream](https://github.com/pffang/libiconv-for-Windows/releases/tag/1.18-eed6782 'github.com/pffang/libiconv-for-Windows/releases/tag/1.18-eed6782')|[diff](https://github.com/externpro/libiconv/compare/v0...xpv1.18.8 'github.com/externpro/libiconv/compare/v0...xpv1.18.8') [bin]| +|[sqlite3](https://www.sqlite.org/index.html 'SQLite website')|[public domain](https://www.sqlite.org/copyright.html 'open-source, not open-contribution')|C-language library that implements a small, fast, self-contained, high-reliability, full-featured, SQL database engine|[xpv3.38.2.3](https://github.com/externpro/SQLite3/releases/tag/xpv3.38.2.3 'release')|[repo](https://github.com/externpro/SQLite3 'github.com/externpro/SQLite3') [upstream](https://github.com/azadkuh/sqlite-amalgamation 'github.com/azadkuh/sqlite-amalgamation')|[diff](https://github.com/externpro/SQLite3/compare/3.38.2...xpv3.38.2.3 'github.com/externpro/SQLite3/compare/3.38.2...xpv3.38.2.3') [patch]| +|[zlib](https://zlib.net 'zlib website')|[permissive](https://zlib.net/zlib_license.html 'zlib/libpng license, see https://en.wikipedia.org/wiki/Zlib_License')|compression library|[xpv1.3.1.4](https://github.com/externpro/zlib/releases/tag/xpv1.3.1.4 'release')|[repo](https://github.com/externpro/zlib 'github.com/externpro/zlib') [upstream](https://github.com/madler/zlib 'github.com/madler/zlib')|[diff](https://github.com/externpro/zlib/compare/v1.3.1...xpv1.3.1.4 'github.com/externpro/zlib/compare/v1.3.1...xpv1.3.1.4') [patch]| + +![deps](xprodeps.svg 'dependencies') + +Dependency version check: all 5 parent-manifest versions match pinned versions. + +|diff |description| +|------|-----------| +|patch |diff modifies/patches existing cmake| +|intro |diff introduces cmake| +|auto |diff adds cmake to replace autotools/configure/make| +|native|diff adds cmake but uses existing build system| +|bin |diff adds cmake to repackage binaries built elsewhere| +|fetch |diff adds cmake and utilizes FetchContent| + +[^_l]: see [SPDX License List](https://spdx.org/licenses/ '') for a list of commonly found licenses +[^_d]: see table above with description of diff diff --git a/xprodeps.svg b/xprodeps.svg new file mode 100644 index 0000000..490c314 --- /dev/null +++ b/xprodeps.svg @@ -0,0 +1,78 @@ + + + + + + +GG + + +spatialite-tools + +spatialite-tools + + + +libspatialite + +libspatialite + + + +spatialite-tools->libspatialite + + + + + +geos + +geos + + + +libspatialite->geos + + + + + +libiconv + +libiconv + + + +libspatialite->libiconv + + + + + +sqlite3 + +sqlite3 + + + +libspatialite->sqlite3 + + + + + +zlib + +zlib + + + +libspatialite->zlib + + + + +