Skip to content

Commit e704330

Browse files
committed
Generate SBOM info
IB-8704 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent ce6074d commit e704330

File tree

200 files changed

+702
-2668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+702
-2668
lines changed

.github/workflows/build.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
submodules: recursive
2222
- name: Download artifact
23-
uses: dawidd6/action-download-artifact@v11
23+
uses: dawidd6/action-download-artifact@v19
2424
with:
2525
workflow: build.yml
2626
branch: master
@@ -60,11 +60,14 @@ jobs:
6060
cmake --build build --target zipdebug
6161
cmake --build build --target macdeployqt
6262
cmake --build build --target zip
63+
cmake --install build/sbom
6364
- name: Archive artifacts
6465
uses: actions/upload-artifact@v6
6566
with:
6667
name: macOS
67-
path: build/qdigidoc4*.zip
68+
path: |
69+
build/qdigidoc4*.zip
70+
build/qdigidoc4*.spdx
6871
ubuntu:
6972
name: Build on Ubuntu ${{ matrix.container }} ${{ matrix.arch }}
7073
runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
@@ -79,7 +82,7 @@ jobs:
7982
DEBEMAIL: github-actions@github.com
8083
steps:
8184
- name: Download artifact
82-
uses: dawidd6/action-download-artifact@v11
85+
uses: dawidd6/action-download-artifact@v19
8386
with:
8487
workflow: build.yml
8588
branch: master
@@ -104,13 +107,18 @@ jobs:
104107
run: |
105108
dpkg-buildpackage -us -uc
106109
mv ../qdigidoc4*.* .
110+
cmake -B build -S .
111+
cmake --install build/sbom
112+
mv build/qdigidoc4*.spdx .
107113
- name: Lintian
108114
run: lintian *.deb;
109115
- name: Archive artifacts
110116
uses: actions/upload-artifact@v6
111117
with:
112118
name: ubuntu_${{ matrix.container }}_${{ matrix.arch }}
113-
path: qdigidoc4*.*
119+
path: |
120+
qdigidoc4*.*
121+
qdigidoc4*.spdx
114122
fedora:
115123
name: Build on Fedora ${{ matrix.container }}
116124
runs-on: ubuntu-latest
@@ -120,7 +128,7 @@ jobs:
120128
container: [42, 43]
121129
steps:
122130
- name: Download artifact
123-
uses: dawidd6/action-download-artifact@v11
131+
uses: dawidd6/action-download-artifact@v19
124132
with:
125133
workflow: build.yml
126134
branch: master
@@ -134,11 +142,14 @@ jobs:
134142
run: |
135143
cmake -DCMAKE_INSTALL_PREFIX=/usr -B build -S .
136144
cmake --build build --target all package
145+
cmake --install build/sbom
137146
- name: Archive artifacts
138147
uses: actions/upload-artifact@v6
139148
with:
140149
name: fedora_${{ matrix.container }}
141-
path: build/qdigidoc4*.rpm
150+
path: |
151+
build/qdigidoc4*.rpm
152+
build/qdigidoc4*.spdx
142153
windows:
143154
name: Build on Windows
144155
runs-on: ${{ matrix.platform == 'arm64' && 'windows-11-arm' || 'windows-2025' }}
@@ -151,7 +162,7 @@ jobs:
151162
steps:
152163
- *Checkout
153164
- name: Download artifact
154-
uses: dawidd6/action-download-artifact@v11
165+
uses: dawidd6/action-download-artifact@v19
155166
with:
156167
workflow: build.yml
157168
branch: master
@@ -190,13 +201,15 @@ jobs:
190201
cmake --build build --target msi
191202
cmake --build build --target msishellext
192203
cmake --build build --target appx
204+
cmake --install build/sbom
193205
- name: Archive artifacts
194206
uses: actions/upload-artifact@v6
195207
with:
196208
name: msi_${{ matrix.vcver }}_${{ matrix.platform }}
197209
path: |
198210
build/*.msi
199211
build/*.appx
212+
build/*.spdx
200213
coverity:
201214
name: Run Coverity tests
202215
if: github.repository == 'open-eid/DigiDoc4-Client' && contains(github.ref, 'coverity_scan')
@@ -207,7 +220,7 @@ jobs:
207220
steps:
208221
- *Checkout
209222
- name: Download artifact
210-
uses: dawidd6/action-download-artifact@v11
223+
uses: dawidd6/action-download-artifact@v19
211224
with:
212225
workflow: build.yml
213226
branch: master
@@ -246,7 +259,7 @@ jobs:
246259
steps:
247260
- *Checkout
248261
- name: Download artifact
249-
uses: dawidd6/action-download-artifact@v11
262+
uses: dawidd6/action-download-artifact@v19
250263
with:
251264
workflow: build.yml
252265
branch: master

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
[submodule "common"]
22
path = common
33
url = ../qt-common
4+
[submodule "cmake/cmake-sbom"]
5+
path = cmake/cmake-sbom
6+
url = https://github.com/DEMCON/cmake-sbom.git
7+
branch = v1.4.0

AppxManifest.xml.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: Estonian Information System Authority
2+
# SPDX-License-Identifier: LGPL-2.1-or-later
3+
14
<?xml version="1.0" encoding="utf-8"?>
25
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
36
xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: Estonian Information System Authority
2+
# SPDX-License-Identifier: LGPL-2.1-or-later
3+
14
cmake_minimum_required(VERSION 3.22)
25
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/common/CMakeLists.txt)
36
message(FATAL_ERROR "common submodule directory empty, did you 'git clone --recursive'?")
@@ -67,3 +70,4 @@ endif()
6770

6871
add_subdirectory( common )
6972
add_subdirectory( client )
73+
include(cmake/sbom.cmake)

client/Application.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* QDigiDoc4
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#define NOMINMAX
215

client/Application.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* QDigiDoc4
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#pragma once
215

client/Application_mac.mm

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* QEstEidCommon
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#include "Application.h"
215

client/CDoc1.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* QDigiDocClient
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#include "CDoc1.h"
215

client/CDoc1.h

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* QDigiDocClient
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#pragma once
215

client/CDoc2.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
/*
2-
* QDigiDocClient
3-
*
4-
* This library is free software; you can redistribute it and/or
5-
* modify it under the terms of the GNU Lesser General Public
6-
* License as published by the Free Software Foundation; either
7-
* version 2.1 of the License, or (at your option) any later version.
8-
*
9-
* This library is distributed in the hope that it will be useful,
10-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
* Lesser General Public License for more details.
13-
*
14-
* You should have received a copy of the GNU Lesser General Public
15-
* License along with this library; if not, write to the Free Software
16-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17-
*
18-
*/
1+
// SPDX-FileCopyrightText: Estonian Information System Authority
2+
// SPDX-License-Identifier: LGPL-2.1-or-later
193

204
#include "CDoc2.h"
215

0 commit comments

Comments
 (0)