From 2b9b5c4c45dab53dc8efb7b57252a335e16754aa Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:07:23 -0600 Subject: [PATCH 1/7] externpro 25.04 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 119133f..de12dc2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 119133f7cafb5ce49e917965bdc01aff6c586b86 +Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c From 5d2e02d1a764384f60071687c067224c4f59f565 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:11:48 -0600 Subject: [PATCH 2/7] update docker-compose links --- docker-compose.sh | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From daed2f48012b2de1c633197fad7805fc1cd6c7b1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:29:01 -0600 Subject: [PATCH 3/7] externpro/.github/workflows @25.04 --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ .github/workflows/release.yml | 16 ++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..3b34b65 --- /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 + 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..6fa033b --- /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 + with: + workflow_run_url: ${{ github.event.inputs.workflow_run_url }} + artifact_pattern: "*.tar.xz" + secrets: inherit From e6d8316c56b62f22d4ccca60e5f56ee602f16915 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:29:18 -0600 Subject: [PATCH 4/7] cmake 3.31 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 811b177..b0fa286 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -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(nasm VERSION 2.14.02) From 210dbdf24b777438390a10a2d23c3d928334bf7d Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:30:17 -0600 Subject: [PATCH 5/7] buildpro_REV now in .devcontainer/cmake/xptoplevel.cmake --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0fa286..9c539f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) include(preproject) project(nasm VERSION 2.14.02) -set(buildpro_REV 24.07) include(flags) include(GNUInstallDirs) set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) From ce42815f4c59e04304eb5fcb450293349606fe55 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:31:11 -0600 Subject: [PATCH 6/7] add .gitattributes --- .gitattributes | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6b484ee --- /dev/null +++ b/.gitattributes @@ -0,0 +1,78 @@ +CMakeLists.txt text eol=lf +Dockerfile text eol=lf +.gitattributes text eol=lf +*.c text eol=lf +*.cfg text eol=lf +*.cls text eol=lf +*.cmake text eol=lf +*.conf text eol=lf +*.cpp text eol=lf +*.cs text eol=lf +*.css text eol=lf +*.csv text eol=lf +*.cu text eol=lf +*.cuh text eol=lf +*.cuhpp text eol=lf +*.cuhpp linguist-detectable +*.cuhpp linguist-language=C++ +*.dae text eol=lf +*.dockerfile text eol=lf +*.dot text eol=lf +*.eps text eol=lf +*.fbs text eol=lf +*.h text eol=lf +*.h.in text eol=lf +*.hpp text eol=lf +*.hpp.in text eol=lf +*.hrc text eol=lf +*.html text eol=lf +*.js text eol=lf +*.json text eol=lf +*.less text eol=lf +*.lua text eof=lf +*.md text eol=lf +*.pjd text eol=lf +*.proto text eol=lf +*.rc text eol=lf +*.rch text eol=lf +*.scss text eol=lf +*.sh text eol=lf +*.svg text eol=lf +*.tex text eol=lf +*.ts text eol=lf +*.txt text eol=lf +*.type text eol=lf +*.xml text eol=lf +*.xpm text eol=lf +*.xsd text eol=lf +*.yml text eol=lf +.*rc text eol=lf +#################### +*.csproj.in text eol=crlf +*.filters text eol=crlf +*.m text eol=crlf +*.resx text eol=crlf +*.rst text eol=crlf +*.sln text eol=crlf +*.sql text eol=crlf +*.vcproj text eol=crlf +*.vcxproj text eol=crlf +#################### +*.bin binary +*.bmp binary +*.db binary +*.doc binary +*.eap binary +*.gif binary +*.ico binary +*.jpeg binary +*.jpg binary +*.mp3 binary +*.ntf binary +*.pdf binary +*.png binary +*.rtf binary +*.vsd binary +*.xcf binary +*.xlsx binary +*.zip binary From cb049d7870edf86e93b204190dbda2fca7e1aa3d Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 22:34:25 -0600 Subject: [PATCH 7/7] CMakePresets: Release obsolete, change Vs2019 to Vs2022 --- CMakePresets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 08d18a9..5a06690 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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" ] }