From 843ca4688ca1f29065bcb54c9550721fce572a80 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 17:03:09 -0400 Subject: [PATCH 1/9] Updated to use GitHub Packages. --- .github/dependabot.yml | 13 +++ .github/workflows/c-cpp.yml | 63 +++++++------ .github/workflows/release-package.yml | 52 +++++++++++ .gitignore | 91 ++++++++++++++++++ pom.xml | 127 ++++++++++++++++++++++++++ 5 files changed, 316 insertions(+), 30 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/release-package.yml create mode 100644 .gitignore create mode 100644 pom.xml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..9928a76 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "weekly" + day: "sunday" + time: "00:25" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + day: "saturday" diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 3619963..8f0a6b2 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -1,4 +1,4 @@ -name: C/C++ CI +name: C/C++ CI and Maven Package on: push: @@ -10,37 +10,40 @@ on: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - # os: [centos7, rhel8] - os: [rhel8] - include: - # - os: centos7 - # container: "centos:7" - - os: rhel8 - container: "oraclelinux:8" - container: ${{ matrix.container }} - + container: oraclelinux:8 + permissions: + contents: read steps: - - name: checkout for centos7 - if: ${{ matrix.os == 'centos7' }} - uses: actions/checkout@v3 - - - name: checkout for rhel8 - if: ${{ matrix.os == 'rhel8' }} - uses: actions/checkout@v4 - - - name: install dependencies - run: | + - uses: actions/checkout@v6 + - run: | yum install -y epel-release yum install -y make gcc-c++ openssl-devel utf8proc-devel - - - name: make osptk - run: | - cd $GITHUB_WORKSPACE/src + - run: | + cd src make build + - uses: actions/upload-artifact@v7 + with: + name: osptoolkit + path: | + osptoolkit/include/osp + osptoolkit/lib + if-no-files-found: error - - name: make test_app - run: | - cd $GITHUB_WORKSPACE/test - make linux + package: + needs: build + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-java@v5 + with: + java-version: "21" + distribution: "corretto" + cache: "maven" + server-id: github + - uses: actions/download-artifact@v8 + with: + name: osptoolkit + - run: | + mvn -B install diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml new file mode 100644 index 0000000..288f4f8 --- /dev/null +++ b/.github/workflows/release-package.yml @@ -0,0 +1,52 @@ +name: C/C++ CI and Maven Deploy + +on: + push: + branches: [master] + pull_request: + branches: [master] + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + container: oraclelinux:8 + permissions: + contents: read + steps: + - uses: actions/checkout@v6 + - run: | + yum install -y epel-release + yum install -y make gcc-c++ openssl-devel utf8proc-devel + - run: | + cd src + make build + - uses: actions/upload-artifact@v7 + with: + name: osptoolkit + path: | + osptoolkit/include/osp + osptoolkit/lib + if-no-files-found: error + + package: + needs: build + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-java@v5 + with: + java-version: "21" + distribution: "corretto" + cache: "maven" + server-id: github + - uses: actions/download-artifact@v8 + with: + name: osptoolkit + - run: | + mvn -B deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8cc90d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,91 @@ +# For Maven + +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://maven.apache.org/wrapper/#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +# Eclipse m2e generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# For C++ + +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Linker files +*.ilk + +# Debugger Files +*.pdb + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll +*.so.* + + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# Build directories +build/ +Build/ +build-*/ + +# CMake generated files +CMakeFiles/ +CMakeCache.txt +cmake_install.cmake +Makefile +install_manifest.txt +compile_commands.json + +# Temporary files +*.tmp +*.log +*.bak +*.swp + +# vcpkg +vcpkg_installed/ + +# debug information files +*.dwo + +# test output & cache +Testing/ +.cache/ \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a3eb7b9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,127 @@ + + + + + 4.0.0 + + com.transnexus.c + osptoolkit + ${revision}+${profile.id} + pom + + + OSPToolkit + https://github.com/TransNexus/osptoolkit + + + github + GitHub Apache Maven Packages + https://maven.pkg.github.com/TransNexus/osptoolkit + + + + + + UTF-8 + 21 + 4.33.0 + + + + + + + maven-clean-plugin + 3.5.0 + + + maven-resources-plugin + 3.5.0 + + + maven-compiler-plugin + 3.15.0 + + + maven-surefire-plugin + 3.5.5 + + + maven-jar-plugin + 3.5.0 + + + maven-install-plugin + 3.1.4 + + + maven-deploy-plugin + 3.1.4 + + + maven-site-plugin + 3.21.0 + + + maven-project-info-reports-plugin + 3.9.0 + + + org.apache.maven.plugins + maven-help-plugin + 3.5.1 + + + maven-assembly-plugin + 3.8.0 + + false + + + distribute + + tar.gz + + + + + ${project.basedir}/include + / + + + + ${project.basedir}/lib + / + + + + + + + + build-package + package + + single + + + + + + + + + + + rhel8 + + rhel8 + + + true + + + + \ No newline at end of file From 62c126e3d14d18f64b6ad726d5a6358b0fb82c03 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 20:20:55 -0400 Subject: [PATCH 2/9] Updated package folders. --- .github/workflows/c-cpp.yml | 4 ++-- .github/workflows/release-package.yml | 4 ++-- pom.xml | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 8f0a6b2..c2d473d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -25,8 +25,7 @@ jobs: with: name: osptoolkit path: | - osptoolkit/include/osp - osptoolkit/lib + osptoolkit/lib/libosptk.a if-no-files-found: error package: @@ -46,4 +45,5 @@ jobs: with: name: osptoolkit - run: | + mv libosptk.a lib mvn -B install diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 288f4f8..749c076 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -25,8 +25,7 @@ jobs: with: name: osptoolkit path: | - osptoolkit/include/osp - osptoolkit/lib + osptoolkit/lib/libosptk.a if-no-files-found: error package: @@ -47,6 +46,7 @@ jobs: with: name: osptoolkit - run: | + mv libosptk.a lib mvn -B deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/pom.xml b/pom.xml index a3eb7b9..de3e164 100644 --- a/pom.xml +++ b/pom.xml @@ -84,16 +84,22 @@ tar.gz + + + ${project.basedir}/RELNOTES.txt + / + + ${project.basedir}/include - / + /include ${project.basedir}/lib - / + /lib From 5403f57a45eb2ad5b9e210a6476488444e09e633 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 20:27:41 -0400 Subject: [PATCH 3/9] Fixed path issue. --- .github/workflows/c-cpp.yml | 4 ++-- .github/workflows/release-package.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index c2d473d..b26524e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -19,13 +19,13 @@ jobs: yum install -y epel-release yum install -y make gcc-c++ openssl-devel utf8proc-devel - run: | - cd src + cd $GITHUB_WORKSPACE/src make build - uses: actions/upload-artifact@v7 with: name: osptoolkit path: | - osptoolkit/lib/libosptk.a + $GITHUB_WORKSPACE/lib/libosptk.a if-no-files-found: error package: diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 749c076..a648697 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -19,13 +19,13 @@ jobs: yum install -y epel-release yum install -y make gcc-c++ openssl-devel utf8proc-devel - run: | - cd src + cd $GITHUB_WORKSPACE/src make build - uses: actions/upload-artifact@v7 with: name: osptoolkit path: | - osptoolkit/lib/libosptk.a + $GITHUB_WORKSPACE/lib/libosptk.a if-no-files-found: error package: From b2fb1fa5d6b4fbdcfa57a1659fd29890c1c66a7a Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 20:43:39 -0400 Subject: [PATCH 4/9] Test path. --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b26524e..705324b 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -21,6 +21,7 @@ jobs: - run: | cd $GITHUB_WORKSPACE/src make build + ls -l $GITHUB_WORKSPACE/lib - uses: actions/upload-artifact@v7 with: name: osptoolkit From cd6b91f38a87a329ca8233cfef14a58060e71437 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 20:53:05 -0400 Subject: [PATCH 5/9] Test upload path. --- .github/workflows/c-cpp.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 705324b..307db15 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -21,12 +21,11 @@ jobs: - run: | cd $GITHUB_WORKSPACE/src make build - ls -l $GITHUB_WORKSPACE/lib - uses: actions/upload-artifact@v7 with: name: osptoolkit path: | - $GITHUB_WORKSPACE/lib/libosptk.a + ${{ github.workspace }}/lib/libosptk.a if-no-files-found: error package: From 01e7a5e319a5c5c514dc25b3f68f7c3a5c230cf1 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 21:01:11 -0400 Subject: [PATCH 6/9] Updated for 4.33.0-rc.1 --- .github/workflows/release-package.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index a648697..6a15209 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -25,7 +25,7 @@ jobs: with: name: osptoolkit path: | - $GITHUB_WORKSPACE/lib/libosptk.a + ${{ github.workspace }}/lib/libosptk.a if-no-files-found: error package: diff --git a/pom.xml b/pom.xml index de3e164..74b06e2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 21 - 4.33.0 + 4.33.0-rc.1 From 18fb5ecbfe0b277443eeb41ac0a1b3e334aa592b Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Tue, 10 Mar 2026 21:12:58 -0400 Subject: [PATCH 7/9] Updated for 4.33.0-rc.2. --- .github/workflows/release-package.yml | 7 ++----- pom.xml | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 6a15209..6557780 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -1,11 +1,8 @@ name: C/C++ CI and Maven Deploy on: - push: - branches: [master] - pull_request: - branches: [master] - workflow_dispatch: + release: + types: [created] jobs: build: diff --git a/pom.xml b/pom.xml index 74b06e2..3ec66b5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 21 - 4.33.0-rc.1 + 4.33.0-rc.2 From 6bfd1204dbc65943f5cb79a287c83d803f23d583 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Wed, 11 Mar 2026 09:13:02 -0400 Subject: [PATCH 8/9] Updated release notes for 4.33.0. --- RELNOTES.txt | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELNOTES.txt b/RELNOTES.txt index 0b0e9da..058cb27 100644 --- a/RELNOTES.txt +++ b/RELNOTES.txt @@ -818,3 +818,5 @@ Version 4.31.0 - 2025-04-25 Version 4.32.0 - 2025-05-22 * Updated for STIRv2. +Version 4.33.0 - 2026-03-11 +* Updated to use GitHub Packages. diff --git a/pom.xml b/pom.xml index 3ec66b5..de3e164 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 21 - 4.33.0-rc.2 + 4.33.0 From 0b6863268363eaba044270a8c9e300223e391014 Mon Sep 17 00:00:00 2001 From: Di-Shi Sun Date: Wed, 11 Mar 2026 09:39:51 -0400 Subject: [PATCH 9/9] Updated version in code. --- include/osp/osplibversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/osp/osplibversion.h b/include/osp/osplibversion.h index 368c194..85abcec 100644 --- a/include/osp/osplibversion.h +++ b/include/osp/osplibversion.h @@ -20,7 +20,7 @@ #define _OSPLIBVERSION_H #define OSP_CLIENT_TOOLKIT_VERSION_MAJOR 4 -#define OSP_CLIENT_TOOLKIT_VERSION_MINOR 32 +#define OSP_CLIENT_TOOLKIT_VERSION_MINOR 33 #define OSP_CLIENT_TOOLKIT_VERSION_BUGFIX 0 #endif /* _OSPLIBVERSION_H */