diff --git a/.devcontainer b/.devcontainer index 313d502..de12dc2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 313d502797c9d5315bfb67d4b1cfe5fab58f509b +Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b120831 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + workflow_dispatch: +jobs: + linux: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04.2 + with: + cmake-workflow-preset: Linux + runon: ubuntu-latest + secrets: inherit + linux-arm64: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04.2 + with: + cmake-workflow-preset: Linux + runon: ubuntu-24.04-arm + secrets: inherit + windows: + uses: externpro/externpro/.github/workflows/build-windows.yml@25.04.2 + with: + cmake-workflow-preset: Windows + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..598ccec --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,16 @@ +name: Release +on: + workflow_dispatch: + inputs: + workflow_run_url: + description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)' + required: true + type: string +jobs: + # Upload build artifacts as release assets + release-from-build: + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04.2 + with: + workflow_run_url: ${{ github.event.inputs.workflow_run_url }} + artifact_pattern: "*.tar.xz" + secrets: inherit diff --git a/.gitignore b/.gitignore index 28233dc..1dc0e94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ # ignore all subdirectories **/ -# Exclude specific subdirectories/dotfiles to track +# track .devcontainer, .github directory, and contents !.devcontainer +!.github +!.github/* # externpro .env diff --git a/CMakeLists.txt b/CMakeLists.txt index 715ca50..1b78427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.28) +cmake_minimum_required(VERSION 3.31) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) include(preproject) project(SQLite3 @@ -10,7 +10,6 @@ include(GNUInstallDirs) #------------------------------------------------------------------------------ # externpro -set(buildpro_REV 24.07) include(flags) if(NOT DEFINED XP_NAMESPACE) set(XP_NAMESPACE SQLite) diff --git a/CMakePresets.json b/CMakePresets.json index b168c95..5a06690 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,6 +2,6 @@ "version": 8, "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", - ".devcontainer/cmake/presets/xpWindowsVs2019.json" + ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } diff --git a/docker-compose.sh b/docker-compose.sh index 57f36db..85f182f 120000 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -1 +1 @@ -.devcontainer/compose.bld.sh \ No newline at end of file +.devcontainer/compose.pro.sh \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 7e6cc2e..46c1f89 120000 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1 +1 @@ -.devcontainer/compose.pro.yml \ No newline at end of file +.devcontainer/compose.bld.yml \ No newline at end of file