Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
container: ubuntu:${{ matrix.container }}
strategy:
matrix:
container: ['22.04', '24.04', '25.10']
container: ['22.04', '24.04', '25.10', '26.04']
arch: ['amd64', 'arm64']
env:
DEBIAN_FRONTEND: noninteractive
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Lintian
run: lintian *.deb;
- name: Archive artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: ubuntu_${{ matrix.container }}_${{ matrix.arch }}
path: libcdoc*.*
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
cmake --build --preset ${{ matrix.target }}
cmake --build --preset ${{ matrix.target }} --target install/strip
- name: Archive artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: ${{ matrix.target }}
path: |
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Install
run: cmake --build --preset ${{ matrix.target }} --target install/strip
- name: Archive artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: ${{ matrix.target }}
path: ${{ env.DEST }}
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
ctest -V -C RelWithDebInfo --test-dir build
cmake --install build --config RelWithDebInfo --prefix ${{ env.DEST }}
- name: Archive artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: ${{ matrix.image }}_${{ matrix.platform }}
path: ${{ env.DEST }}
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
list(APPEND CPACK_RPM_RELOCATION_PATHS ${CMAKE_INSTALL_SYSCONFDIR})
set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
set(MACOSX_BUNDLE_COPYRIGHT "(C) 2017-2025 Estonian Information System Authority")
set(MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION})
set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_NUMBER})
if(APPLE)
set(FRAMEWORK YES CACHE BOOL "Build library as Mac OS X Framework")
set(FRAMEWORK_DESTINATION /Library/Frameworks CACHE PATH "Mac OS X Framework install destination")
Expand Down
2 changes: 2 additions & 0 deletions cdoc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ set_target_properties(cdoc PROPERTIES
FRAMEWORK_VERSION 1
FRAMEWORK "${FRAMEWORK}"
MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.cdoc"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}
MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_NUMBER}
MACOSX_RPATH YES
POSITION_INDEPENDENT_CODE YES
)
Expand Down
2 changes: 1 addition & 1 deletion cdoc/libcdoc.rc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", TARGET_NAME
VALUE "FileVersion", VERSION_STR
VALUE "InternalName", TARGET_NAME
VALUE "LegalCopyright", "(C) 2025 Estonian Information System Authority"
VALUE "LegalCopyright", "(C) 2025-2026 Estonian Information System Authority"
#ifdef APP
VALUE "OriginalFilename", TARGET_NAME ".exe"
#else
Expand Down
Loading