Commit Graph
100 Commits
Author SHA1 Message Date
peri4 304ac79357 Merge pull request 'master' (#283) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #283
2025-07-17 11:23:40 +03:00
peri4 8180a792a0 Merge branch 'master' of https://git.shstk.ru/SHS/shstk
# Conflicts:
#	pip
2025-07-17 11:22:14 +03:00
peri4 79c780024d cmake, pip, qad 2025-07-17 11:18:30 +03:00
peri4 df52365e8c Merge pull request 'pip and qad' (#282) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #282
2025-06-26 18:32:44 +03:00
peri4 2c656dec36 qad 2025-06-10 00:02:56 +03:00
peri4 24061a4a50 qad 2025-06-09 23:42:08 +03:00
peri4 9df894d3e4 pip, qad 2025-06-07 11:12:55 +03:00
peri4 51fe3a686c pip 2025-05-18 18:53:41 +03:00
peri4 ec470da92a pip 2025-05-14 19:46:53 +03:00
peri4 63d820d590 Merge pull request 'master' (#281) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #281
2025-05-07 13:24:13 +03:00
peri4 5dd239c77c pip 2025-04-30 15:07:34 +03:00
peri4 a0b39f5917 new cmake, pip 2025-04-29 21:51:36 +03:00
peri4 0105212d4a Merge pull request 'master' (#280) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #280
2025-04-09 10:57:47 +03:00
peri4 bee3c14f63 pip 2025-04-03 16:00:49 +03:00
peri4 35b31d6505 qad 2025-03-20 18:48:26 +03:00
peri4 7812b76afa qad 2025-03-19 22:04:03 +03:00
peri4 18e88a5f4d qad 2025-03-18 16:24:13 +03:00
peri4 55c5f7700c qad 2025-03-18 15:17:24 +03:00
peri4 179f03d057 qad 2025-03-18 12:16:22 +03:00
peri4 20aeb0c32f pip 2025-03-06 16:26:49 +03:00
peri4 2f64085db6 pip 2025-03-04 20:20:17 +03:00
peri4 90bb880dc8 qad 2025-03-04 19:59:44 +03:00
peri4 eaa9ad2646 pip 2025-02-27 21:26:40 +03:00
peri4 c943be5bdc Merge pull request 'pip' (#279) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #279
2025-02-13 17:22:07 +03:00
peri4 464e40b8fd pip 2025-02-06 11:13:54 +03:00
peri4 7db344becc Merge pull request 'master' (#278) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #278
2025-01-29 11:54:40 +03:00
peri4 2de259e20a qad 2025-01-29 11:53:52 +03:00
peri4 7e4b054042 pip 2025-01-17 11:49:35 +03:00
peri4 3713c8e4bf pip 2025-01-15 18:38:58 +03:00
peri4 d64cb3cc75 pip 2025-01-15 18:25:40 +03:00
peri4 398480e723 pip 2025-01-15 17:59:12 +03:00
peri4 00bd919141 Merge pull request 'master' (#277) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #277
2025-01-12 13:12:15 +03:00
peri4 a8ca305671 pip 2025-01-12 13:11:08 +03:00
peri4 aa15caa298 pip 2025-01-09 17:36:48 +03:00
peri4 5da9a31eda cmake, pip, qad 2025-01-08 17:37:11 +03:00
peri4 47dee3e0bd pip 2024-12-29 11:48:34 +03:00
peri4 2e9bdb946e Merge pull request 'master' (#276) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #276
2024-12-26 16:20:53 +03:00
peri4 e046181600 pip 2024-12-26 16:19:41 +03:00
peri4 ac2d19de68 pip 2024-12-26 16:18:20 +03:00
peri4 41a0eb8549 pip 2024-12-26 16:16:09 +03:00
peri4 6fb2c089d9 pip 2024-12-26 16:12:09 +03:00
peri4 954ae79c5c pip 2024-12-26 16:02:03 +03:00
peri4 c60158c167 pip 2024-12-25 19:38:05 +03:00
peri4 250aa613ad pip 2024-12-25 19:34:57 +03:00
peri4 f658eab4d5 pip 2024-12-25 19:30:25 +03:00
peri4 19f881c2f2 Merge pull request 'new platforms' (#275) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #275
2024-12-25 13:01:22 +03:00
peri4 39fae97c62 new platforms 2024-12-25 13:00:41 +03:00
peri4 e1d92a78bf Merge pull request 'cmake' (#274) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #274
2024-12-19 21:23:14 +03:00
peri4 43dd680a78 cmake 2024-12-19 21:23:06 +03:00
peri4 6068071307 Merge pull request 'j' (#273) from master into release
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #273
2024-12-19 15:01:37 +03:00
peri4 599247f10a j 2024-12-19 15:01:27 +03:00
peri4 642c03a457 Merge pull request 'tmp' (#272) from master into release
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #272
2024-12-19 14:59:01 +03:00
peri4 1d84f21fe4 tmp 2024-12-19 14:58:45 +03:00
peri4 9808bb8a24 Merge pull request 'pip' (#271) from master into release
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #271
2024-12-03 15:41:58 +03:00
peri4 51f3eda2a8 pip 2024-12-03 15:41:43 +03:00
peri4 147bf31acd Merge pull request 'fix dockers' (#270) from master into release
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #270
2024-12-03 13:32:44 +03:00
peri4 812fe73092 fix dockers 2024-12-03 13:32:24 +03:00
peri4 143ba3750a Merge pull request 'rrr' (#269) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #269
2024-12-03 11:34:37 +03:00
peri4 52caaa7b47 rrr 2024-12-03 11:34:28 +03:00
peri4 ffaa283278 Merge pull request 'another try' (#268) from master into release
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #268
2024-12-03 11:33:53 +03:00
peri4 cf130ec054 another try 2024-12-03 11:33:43 +03:00
peri4 2ede2da4b2 Merge pull request 'try to work' (#267) from master into release
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #267
2024-12-03 11:31:20 +03:00
peri4 348d39f566 try to work 2024-12-03 11:31:08 +03:00
peri4 69c5d80912 Merge pull request 'fix' (#266) from master into release
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #266
2024-12-03 11:28:58 +03:00
peri4 614729cc94 fix 2024-12-03 11:28:44 +03:00
peri4 2b33275310 Merge pull request 'test debug builds' (#265) from master into release
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #265
2024-12-03 11:27:49 +03:00
peri4 549b9864e0 test debug builds 2024-12-03 11:26:14 +03:00
peri4 f710464480 Merge pull request 'pip, Jenkinsfile' (#264) from master into release
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #264
2024-11-28 13:36:21 +03:00
peri4 72c82b787c pip, Jenkinsfile 2024-11-28 13:36:11 +03:00
peri4 566499fd2b Merge pull request 'Jenkinsfile' (#263) from master into release
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #263
2024-11-28 12:44:38 +03:00
peri4 40f2a424ac Jenkinsfile 2024-11-28 12:44:29 +03:00
peri4 e0066b4c4b Merge pull request 'pip, cd' (#262) from master into release
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: #262
2024-11-28 12:37:32 +03:00
peri4 a3380922a2 pip, cd
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
2024-11-28 12:37:18 +03:00
peri4 f1d171a592 Merge pull request 'pip' (#261) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #261
2024-11-25 16:02:54 +03:00
peri4 e960e28f6d pip 2024-11-25 16:02:46 +03:00
peri4 db1aa4e174 Merge pull request 'master' (#260) from master into release
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #260
2024-11-25 15:53:35 +03:00
peri4 6de1c8cffb pip 2024-11-25 15:53:20 +03:00
peri4 92286944fb pip 2024-11-25 15:00:50 +03:00
peri4 0c8f0e3af5 pip 2024-11-21 16:31:49 +03:00
peri4 8fbfab2d9d pip 2024-11-21 00:19:02 +03:00
peri4 37f5b499d1 pip 2024-11-21 00:10:42 +03:00
peri4 c2d53bf69b cd, pip, qad 2024-11-20 20:02:29 +03:00
peri4 179524f5ca Merge pull request '2000 last builds' (#257) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #257
2024-11-19 15:23:57 +03:00
peri4 1e2cf22e0a 2000 last builds 2024-11-19 15:23:44 +03:00
peri4 11758006ce Merge pull request 'master' (#256) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #256
2024-11-18 22:47:21 +03:00
peri4 f8e39467b0 pip 2024-11-18 22:47:11 +03:00
peri4 4cab304f43 pip 2024-11-16 15:46:18 +03:00
peri4 142ab4504e Merge pull request 'master' (#254) from master into release
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: #254
2024-11-15 19:00:52 +03:00
peri4 a0c25ea76b Merge pull request 'test' (#253) from test into master
Reviewed-on: #253
2024-11-15 18:55:25 +03:00
peri4 98c9ef3b9b Jenkinsfile
SHS Gitea/shstk/pipeline/head This commit looks good
2024-11-15 18:02:34 +03:00
peri4 058f8d4026 pip
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2024-11-15 17:14:25 +03:00
peri4 da1883822c pip
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2024-11-15 16:23:55 +03:00
peri4 9eba538a56 pip
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2024-11-15 15:48:12 +03:00
peri4 fe5eeac297 pip
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2024-11-15 15:43:18 +03:00
peri4 b0d08801b7 Dockerfiles fix
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2024-11-15 14:49:37 +03:00
peri4 4eadb31df2 try2
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2024-11-15 14:47:15 +03:00
peri4 4a3c41408e Merge pull request 'try' (#252) from master into test
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #252
2024-11-15 14:42:56 +03:00
peri4 67272f9149 try 2024-11-15 14:42:22 +03:00
peri4 29c72eb915 Merge pull request 'pass branch name to docker build' (#251) from master into test
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: #251
2024-11-15 14:40:17 +03:00
peri4 c4ead44fde pass branch name to docker build 2024-11-15 14:40:01 +03:00