Skip to content

patch with ghactions #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smanders merged 10 commits into from
Jul 19, 2025
Merged

patch with ghactions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f7c379a
externpro 25.03-12-ge6ea091
smanders Jun 10, 2025
db2cac9
update docker-compose links
smanders Jun 10, 2025
f6a445e
externpro 25.04
smanders Jul 18, 2025
894b927
cmake 3.31
smanders Jul 18, 2025
2950da8
externpro/.github/workflows @25.04
smanders Jul 18, 2025
e30362f
cmake: buildpro_REV in .devcontainer/cmake/xptoplevel now
smanders Jul 18, 2025
baf2216
CMakePresets: xpLinuxNinja and xpWindowsVs2022
smanders Jul 18, 2025
e39f0bf
download patch-2.7.6-bin.zip on Windows from github.com/externpro/patch
smanders Jul 19, 2025
3177da8
ExternalProject_Add SHA256 correction
smanders Jul 19, 2025
8dad6b0
ExternalProject_Add SHA256 correction, take 2
smanders Jul 19, 2025
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
2 changes: 1 addition & 1 deletion .devcontainer
Open in desktop
Submodule .devcontainer updated 79 files
+0 −1 .dockerignore
+78 −0 .gitattributes
+197 −0 .github/workflows/README.md
+119 −0 .github/workflows/build-linux.yml
+60 −0 .github/workflows/build-windows.yml
+277 −0 .github/workflows/release-from-build.yml
+0 −1 .gitignore
+0 −11 90-bpnet-perform.conf
+38 −108 README.md
+0 −42 centos7-run.dockerfile
+0 −13 check-bpnet-perform.sh
+78 −0 cmake/Findexternpro.cmake
+5 −58 cmake/Findscript.cmake.in
+78 −0 cmake/Findwebpro.cmake
+36 −0 cmake/NodePath.cmake
+71 −0 cmake/README.md
+203 −0 cmake/cpack/README.md
+12 −0 cmake/cpack/scripts.cpackcond.in
+14 −0 cmake/cpack/scripts.postinstall.client.in
+35 −0 cmake/cpack/scripts.postinstall.in
+21 −0 cmake/cpack/scripts.preinstall.in
+16 −0 cmake/cpack/scripts.preremove.in
+14 −0 cmake/cpack/scripts.service.in
+114 −0 cmake/deps.cmake
+41 −0 cmake/deps.dot
+ − cmake/deps.png
+3 −15 cmake/flags.cmake
+11 −4 cmake/macpro.cmake
+7 −0 cmake/presets/CMakePresets.json
+10 −0 cmake/presets/CMakePresetsBase.json
+28 −0 cmake/presets/launchWorkflow.cmake
+0 −117 cmake/presets/xpLinuxMakefiles.json
+7 −17 cmake/presets/xpLinuxMakefilesRelease.json
+98 −10 cmake/presets/xpLinuxNinja.json
+84 −16 cmake/presets/xpWindowsVs2019.json
+5 −33 cmake/presets/xpWindowsVs2019Package.json
+157 −0 cmake/presets/xpWindowsVs2022.json
+419 −0 cmake/pros.cmake
+34 −0 cmake/sync.cmake
+34 −0 cmake/sync.sh.in
+12 −0 cmake/version.js.in
+24 −0 cmake/version.ts.in
+36 −0 cmake/versionjs.cmake
+234 −0 cmake/xpcfg.cmake
+143 −0 cmake/xpcpack.cmake
+227 −94 cmake/xpfunmac.cmake
+30 −0 cmake/xptoplevel.cmake
+1 −1 cmake/xpuse.cmake.in
+829 −0 cmake/xpweb.cmake
+3 −33 compose.bld.sh
+8 −11 compose.bld.yml
+6 −0 compose.ci.sh
+6 −7 compose.gpu.sh
+7 −12 compose.gpu.yml
+6 −0 compose.pro.sh
+0 −38 compose.pro.yml
+0 −56 compose.vantage.sh
+0 −111 compose.vantage.yml
+0 −9 dbinit/01-databases.sql
+84 −140 denv.sh
+15 −15 devcontainer.json
+0 −5 dockergen/bit.browsers.dockerfile
+0 −6 dockergen/bit.head.dockerfile
+0 −17 dockergen/bit.isrhub.dockerfile
+0 −3 dockergen/bit.offline.dockerfile
+0 −8 dockergen/bit.run.dockerfile
+0 −2 dockergen/bit.tail.dockerfile
+0 −26 dockergen/bit.user.dockerfile
+0 −5 dockergen/defaults.txt
+0 −23 dockergen/dockergen.sh
+0 −22 dockergen/graph.dot
+ − dockergen/graph.png
+86 −89 funcs.sh
+23 −0 graph/graph.dot
+ − graph/graph.png
+20 −10 local.dockerfile
+0 −68 odbc.ini.test
+0 −59 rocky85-bld.dockerfile
+0 −59 rocky85-dev.dockerfile
25 changes: 25 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
with:
cmake-workflow-preset: LinuxRelease
runon: ubuntu-latest
secrets: inherit
linux-arm64:
uses: externpro/externpro/.github/workflows/build-linux.yml@25.04
with:
cmake-workflow-preset: LinuxRelease
runon: ubuntu-24.04-arm
secrets: inherit
windows:
uses: externpro/externpro/.github/workflows/build-windows.yml@25.04
with:
cmake-workflow-preset: WindowsRelease
secrets: inherit
16 changes: 16 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
with:
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
artifact_pattern: "*.tar.xz"
secrets: inherit
7 changes: 3 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
cmake_minimum_required(VERSION 3.28)
cmake_minimum_required(VERSION 3.31)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake)
include(preproject)
project(patch VERSION 2.7)
set(buildpro_REV 24.03)
include(flags)
include(GNUInstallDirs)
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
Expand All @@ -12,8 +11,8 @@ if(WIN32 AND NOT UNIX)
set(VER 2.7.6)
ExternalProject_Add(${PROJECT_NAME}
DOWNLOAD_EXTRACT_TIMESTAMP true
URL https://github.com/smanders/externpro/releases/download/20.10.1/patch-${VER}-bin.zip
URL_MD5 e0d4690179d85c1cf543f52856a63db9
URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip
URL_HASH SHA256=eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_if_different
<SOURCE_DIR>/patch.exe <INSTALL_DIR>/bin/patcz.exe
BUILD_COMMAND ${CMAKE_COMMAND} -E copy_if_different
Expand Down
4 changes: 2 additions & 2 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 8,
"include": [
".devcontainer/cmake/presets/xpLinuxNinjaRelease.json",
".devcontainer/cmake/presets/xpWindowsVs2019Release.json"
".devcontainer/cmake/presets/xpLinuxNinja.json",
".devcontainer/cmake/presets/xpWindowsVs2022.json"
]
}
2 changes: 1 addition & 1 deletion docker-compose.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.devcontainer/compose.bld.sh
.devcontainer/compose.pro.sh
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.devcontainer/compose.pro.yml
.devcontainer/compose.bld.yml