Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Stirling-Tools/Stirling-PDF
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb5c19c8953a217d8529ecd8f005ee52cbb39196
Choose a base ref
..
head repository: Stirling-Tools/Stirling-PDF
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d5b16c2ce76991e7ce85514b0e1c51f926c15fe
Choose a head ref
Showing with 15,796 additions and 4,165 deletions.
  1. +8 −1 .github/labeler-config.yml
  2. +1 −0 .github/scripts/requirements_sync_readme.in
  3. +10 −0 .github/scripts/requirements_sync_readme.txt
  4. +14 −2 .github/workflows/PR-Demo-Comment.yml
  5. +2 −1 .github/workflows/PR-Demo-cleanup.yml
  6. +2 −1 .github/workflows/auto-labeler.yml
  7. +24 −9 .github/workflows/build.yml
  8. +137 −47 .github/workflows/check_properties.yml
  9. +3 −2 .github/workflows/licenses-update.yml
  10. +2 −1 .github/workflows/manage-label.yml
  11. +3 −2 .github/workflows/multiOSReleases.yml
  12. +4 −3 .github/workflows/pre_commit.yml
  13. +6 −31 .github/workflows/push-docker.yml
  14. +124 −28 .github/workflows/releaseArtifacts.yml
  15. +2 −1 .github/workflows/stale.yml
  16. +2 −1 .github/workflows/swagger.yml
  17. +5 −4 .github/workflows/sync_files.yml
  18. +4 −3 .github/workflows/update-translations.yml
  19. +26 −3 .gitignore
  20. +1 −1 .pre-commit-config.yaml
  21. +2 −2 CONTRIBUTING.md
  22. +1 −1 Dockerfile.fat
  23. +0 −46 Endpoint-groups.md
  24. +0 −41 FolderScanning.md
  25. +0 −327 LocalRunGuide.md
  26. +0 −42 PipelineFeature.md
  27. +64 −313 README.md
  28. +0 −68 Version-groups.md
  29. +36 −8 build.gradle
  30. +0 −1 cucumber/exampleFiles/example.html
  31. +1 −1 cucumber/features/environment.py
  32. +6 −6 cucumber/features/general.feature
  33. +13 −12 cucumber/features/steps/step_definitions.py
  34. +5 −0 cucumber/requirements.in
  35. +259 −5 cucumber/requirements.txt
  36. +63 −0 exampleYmlFiles/docker-compose-latest-fat-security-postgres.yml
  37. +3 −3 exampleYmlFiles/docker-compose-latest-fat-security.yml
  38. +3 −3 exampleYmlFiles/docker-compose-latest-security.yml
  39. +5 −0 scripts/ignore_translation.toml
  40. +8 −8 src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
  41. +2 −4 src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
  42. +14 −3 src/main/java/stirling/software/SPDF/EE/EEAppConfig.java
  43. +1 −1 src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java
  44. +5 −5 src/main/java/stirling/software/SPDF/EE/LicenseKeyChecker.java
  45. +4 −6 src/main/java/stirling/software/SPDF/LibreOfficeListener.java
  46. +89 −57 src/main/java/stirling/software/SPDF/{SPdfApplication.java → SPDFApplication.java}
  47. +83 −25 src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
  48. +59 −8 src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
  49. +5 −14 src/main/java/stirling/software/SPDF/config/AppConfig.java
  50. +9 −3 src/main/java/stirling/software/SPDF/config/AppUpdateService.java
  51. +5 −16 src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
  52. +23 −17 src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
  53. +5 −2 src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
  54. +18 −19 src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
  55. +2 −1 src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java
  56. +9 −11 src/main/java/stirling/software/SPDF/config/InitialSetup.java
  57. +138 −0 src/main/java/stirling/software/SPDF/config/InstallationPathConfig.java
  58. +7 −9 src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java
  59. +10 −0 src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java
  60. +7 −4 src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
  61. +7 −3 src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
  62. +0 −1 src/main/java/stirling/software/SPDF/config/YamlPropertySourceFactory.java
  63. +0 −17 src/main/java/stirling/software/SPDF/config/interfaces/DatabaseBackupInterface.java
  64. +17 −0 src/main/java/stirling/software/SPDF/config/interfaces/DatabaseInterface.java
  65. +9 −9 src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java
  66. +2 −2 src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java
  67. +8 −6 src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java
  68. +5 −7 src/main/java/stirling/software/SPDF/config/security/FirstLoginFilter.java
  69. +1 −5 src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java
  70. +42 −29 src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java
  71. +10 −7 src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java
  72. +76 −380 src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
  73. +63 −1 src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
  74. +8 −15 src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java
  75. +70 −55 src/main/java/stirling/software/SPDF/config/security/UserService.java
  76. +0 −237 src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java
  77. +143 −0 src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java
  78. +316 −0 src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java
  79. +14 −5 src/main/java/stirling/software/SPDF/config/security/database/ScheduledTasks.java
  80. +3 −3 .../java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
  81. +213 −0 src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java
  82. +3 −1 ...in/java/stirling/software/SPDF/config/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
  83. +0 −2 ...java/stirling/software/SPDF/config/security/saml2/CustomSaml2ResponseAuthenticationConverter.java
  84. +136 −0 src/main/java/stirling/software/SPDF/config/security/saml2/SAML2Configuration.java
  85. +1 −6 src/main/java/stirling/software/SPDF/config/security/session/SessionPersistentRegistry.java
  86. +6 −3 src/main/java/stirling/software/SPDF/config/security/session/SessionScheduled.java
  87. +16 −17 src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java
  88. +18 −29 src/main/java/stirling/software/SPDF/controller/api/DatabaseController.java
  89. +19 −0 src/main/java/stirling/software/SPDF/controller/api/H2SQLCondition.java
  90. +1 −1 src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
  91. +4 −1 src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
  92. +11 −5 src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
  93. +68 −68 src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java
  94. +26 −70 src/main/java/stirling/software/SPDF/controller/api/UserController.java
  95. +56 −8 src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
  96. +7 −7 src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
  97. +12 −17 src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToBookController.java
  98. +10 −10 src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java
  99. +47 −52 src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
  100. +26 −26 src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
  101. +1 −1 src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
  102. +2 −2 src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
  103. +2 −11 src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java
  104. +1 −5 src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java
  105. +9 −36 src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java
  106. +1 −2 src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java
  107. +1 −1 src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
  108. +13 −20 src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
  109. +6 −19 src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
  110. +21 −22 src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java
  111. +43 −82 src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
  112. +146 −157 src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
  113. +44 −56 src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
  114. +124 −1 src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
  115. +2 −10 src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
  116. +1 −1 src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
  117. +30 −59 src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
  118. +11 −9 src/main/java/stirling/software/SPDF/controller/web/DatabaseWebController.java
  119. +46 −54 src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
  120. +6 −3 src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java
  121. +27 −31 src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
  122. +5 −2 src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
  123. +6 −0 src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java
  124. +11 −6 src/main/java/stirling/software/SPDF/controller/web/SignatureController.java
  125. +74 −2 src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
  126. +9 −16 src/main/java/stirling/software/SPDF/model/Authority.java
  127. +16 −16 src/main/java/stirling/software/SPDF/model/Role.java
  128. +1 −2 src/main/java/stirling/software/SPDF/model/SessionEntity.java
  129. +5 −5 src/main/java/stirling/software/SPDF/model/User.java
  130. +5 −0 src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java
  131. +22 −0 src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java
  132. +26 −0 src/main/java/stirling/software/SPDF/model/api/security/RedactionArea.java
  133. +7 −0 src/main/java/stirling/software/SPDF/model/exception/BackupNotFoundException.java
  134. +4 −5 src/main/java/stirling/software/SPDF/model/provider/GithubProvider.java
  135. +4 −5 src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java
  136. +10 −10 src/main/java/stirling/software/SPDF/pdf/TextFinder.java
  137. +5 −2 src/main/java/stirling/software/SPDF/repository/JPATokenRepositoryImpl.java
  138. +3 −18 src/main/java/stirling/software/SPDF/service/CertificateValidationService.java
  139. +1 −5 src/main/java/stirling/software/SPDF/service/PostHogService.java
  140. +7 −2 src/main/java/stirling/software/SPDF/service/SignatureService.java
  141. +2 −3 src/main/java/stirling/software/SPDF/utils/FileInfo.java
  142. +3 −4 src/main/java/stirling/software/SPDF/utils/FileMonitor.java
  143. +1 −6 src/main/java/stirling/software/SPDF/utils/FileToPdf.java
  144. +39 −22 src/main/java/stirling/software/SPDF/utils/GeneralUtils.java
  145. +1 −5 src/main/java/stirling/software/SPDF/utils/ImageProcessingUtils.java
  146. +0 −3 src/main/java/stirling/software/SPDF/utils/PDFManipulationUtils.java
  147. +2 −1 src/main/java/stirling/software/SPDF/utils/PDFToFile.java
  148. +76 −76 src/main/java/stirling/software/SPDF/utils/PdfUtils.java
  149. +20 −26 src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java
  150. +11 −6 src/main/java/stirling/software/SPDF/utils/misc/CustomColorReplaceStrategy.java
  151. +37 −0 src/main/java/stirling/software/SPDF/utils/propertyeditor/StringToArrayListPropertyEditor.java
  152. +2 −18 src/main/resources/application.properties
  153. +15 −18 src/main/resources/logback.xml
  154. +37 −0 src/main/resources/messages_ar_AR.properties
  155. +37 −0 src/main/resources/messages_az_AZ.properties
  156. +37 −0 src/main/resources/messages_bg_BG.properties
  157. +37 −0 src/main/resources/messages_ca_CA.properties
  158. +37 −0 src/main/resources/messages_cs_CZ.properties
  159. +37 −0 src/main/resources/messages_da_DK.properties
  160. +37 −0 src/main/resources/messages_de_DE.properties
  161. +37 −0 src/main/resources/messages_el_GR.properties
  162. +37 −0 src/main/resources/messages_en_GB.properties
  163. +37 −0 src/main/resources/messages_en_US.properties
  164. +37 −0 src/main/resources/messages_es_ES.properties
  165. +37 −0 src/main/resources/messages_eu_ES.properties
  166. +37 −0 src/main/resources/messages_fa_IR.properties
  167. +75 −38 src/main/resources/messages_fr_FR.properties
  168. +37 −0 src/main/resources/messages_ga_IE.properties
  169. +37 −0 src/main/resources/messages_hi_IN.properties
  170. +37 −0 src/main/resources/messages_hr_HR.properties
  171. +37 −0 src/main/resources/messages_hu_HU.properties
  172. +37 −0 src/main/resources/messages_id_ID.properties
  173. +40 −3 src/main/resources/messages_it_IT.properties
  174. +37 −0 src/main/resources/messages_ja_JP.properties
  175. +37 −0 src/main/resources/messages_ko_KR.properties
  176. +37 −0 src/main/resources/messages_nl_NL.properties
  177. +37 −0 src/main/resources/messages_no_NB.properties
  178. +37 −0 src/main/resources/messages_pl_PL.properties
  179. +45 −8 src/main/resources/messages_pt_BR.properties
  180. +37 −0 src/main/resources/messages_pt_PT.properties
  181. +37 −0 src/main/resources/messages_ro_RO.properties
  182. +37 −0 src/main/resources/messages_ru_RU.properties
  183. +37 −0 src/main/resources/messages_sk_SK.properties
  184. +37 −0 src/main/resources/messages_sr_LATN_RS.properties
  185. +49 −12 src/main/resources/messages_sv_SE.properties
  186. +37 −0 src/main/resources/messages_th_TH.properties
  187. +37 −0 src/main/resources/messages_tr_TR.properties
  188. +37 −0 src/main/resources/messages_uk_UA.properties
  189. +37 −0 src/main/resources/messages_vi_VN.properties
  190. +1,366 −0 src/main/resources/messages_zh_BO.properties
  191. +37 −0 src/main/resources/messages_zh_CN.properties
  192. +37 −0 src/main/resources/messages_zh_TW.properties
  193. +11 −1 src/main/resources/settings.yml.template
  194. +7 −0 src/main/resources/static/3rdPartyLicenses.json
  195. +31 −4 src/main/resources/static/css/add-image.css
  196. +54 −2 src/main/resources/static/css/fileSelect.css
  197. +16 −1 src/main/resources/static/css/general.css
  198. +322 −0 src/main/resources/static/css/redact.css
  199. +52 −2 src/main/resources/static/css/sign.css
  200. +13 −0 src/main/resources/static/images/rename.svg
  201. +7 −7 src/main/resources/static/js/cacheFormInputs.js
  202. +37 −0 src/main/resources/static/js/csrf.js
  203. +1 −1 src/main/resources/static/js/darkmode.js
  204. +281 −111 src/main/resources/static/js/draggable-utils.js
  205. +4 −4 src/main/resources/static/js/fetch-utils.js
  206. +155 −15 src/main/resources/static/js/fileInput.js
  207. +5 −5 src/main/resources/static/js/game.js
  208. +15 −0 src/main/resources/static/js/multitool/PdfContainer.js
  209. +24 −24 src/main/resources/static/js/multitool/fileInput.js
  210. +38 −9 src/main/resources/static/js/pages/add-image.js
  211. +32 −7 src/main/resources/static/js/pages/sign.js
  212. +1,206 −0 src/main/resources/static/js/redact.js
  213. +0 −1 src/main/resources/static/js/settings.js
  214. +85 −0 src/main/resources/static/js/sign/signature-canvas.js
  215. +5,076 −0 src/main/resources/static/pdfjs-legacy/css/viewer-redact.css
  216. +9 −9 src/main/resources/static/pdfjs-legacy/pdf.mjs
  217. +23 −14 src/main/resources/templates/account.html
  218. +1 −1 src/main/resources/templates/addUsers.html
  219. +7 −0 src/main/resources/templates/convert/pdf-to-img.html
  220. +2 −2 src/main/resources/templates/database.html
  221. +6 −2 src/main/resources/templates/fragments/common.html
  222. +3 −3 src/main/resources/templates/fragments/footer.html
  223. +1 −0 src/main/resources/templates/fragments/languages.html
  224. +82 −71 src/main/resources/templates/fragments/navbar.html
  225. +13 −0 src/main/resources/templates/fragments/navbarEntryCustom.html
  226. +89 −75 src/main/resources/templates/home.html
  227. +74 −34 src/main/resources/templates/login.html
  228. +109 −51 src/main/resources/templates/misc/add-image.html
  229. +1 −1 src/main/resources/templates/misc/ocr-pdf.html
  230. +45 −44 src/main/resources/templates/multi-tool.html
  231. +2 −2 src/main/resources/templates/pipeline.html
  232. +45 −46 src/main/resources/templates/releases.html
  233. +718 −0 src/main/resources/templates/security/redact.html
  234. +3 −3 src/main/resources/templates/security/validate-signature.html
  235. +116 −115 src/main/resources/templates/sign.html
  236. +56 −0 src/test/java/stirling/software/SPDF/SPDFApplicationTest.java
  237. +0 −94 src/test/java/stirling/software/SPDF/SPdfApplicationTest.java
  238. +106 −0 src/test/java/stirling/software/SPDF/config/security/database/DatabaseConfigTest.java
  239. +10 −5 src/test/java/stirling/software/SPDF/controller/api/RearrangePagesPDFControllerTest.java
  240. +2 −4 src/test/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPdfTest.java
  241. +3 −4 src/test/java/stirling/software/SPDF/utils/FileToPdfTest.java
  242. +152 −96 src/test/java/stirling/software/SPDF/utils/GeneralUtilsTest.java
  243. +7 −7 src/test/java/stirling/software/SPDF/utils/ImageProcessingUtilsTest.java
  244. +3 −5 src/test/java/stirling/software/SPDF/utils/PdfUtilsTest.java
  245. +3 −3 src/test/java/stirling/software/SPDF/utils/ProcessExecutorTest.java
  246. +2 −2 src/test/java/stirling/software/SPDF/utils/RequestUriUtilsTest.java
  247. +8 −8 src/test/java/stirling/software/SPDF/utils/WebResponseUtilsTest.java
  248. +5 −5 test.sh
9 changes: 8 additions & 1 deletion .github/labeler-config.yml
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ Front End:
- any-glob-to-any-file: 'src/main/resources/templates/**/*'
- any-glob-to-any-file: 'src/main/resources/static/**/*'
- any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/**'
- any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/UI/**/*'

Java:
- changed-files:
@@ -29,6 +30,7 @@ Security:
- any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*'
- any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/provider/**/*'
- any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/AuthenticationType.java'
- any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/model/BackupNotFoundException.java'
- any-glob-to-any-file: 'scripts/download-security-jar.sh'
- any-glob-to-any-file: '.github/workflows/dependency-review.yml'
- any-glob-to-any-file: '.github/workflows/scorecards.yml'
@@ -49,12 +51,17 @@ Documentation:

Docker:
- changed-files:
- any-glob-to-any-file: '.github/workflows/build.yml'
- any-glob-to-any-file: '.github/workflows/push-docker.yml'
- any-glob-to-any-file: 'Dockerfile'
- any-glob-to-any-file: 'Dockerfile-*'
- any-glob-to-any-file: 'Dockerfile.*'
- any-glob-to-any-file: 'exampleYmlFiles/*.yml'
- any-glob-to-any-file: 'scripts/download-security-jar.sh'
- any-glob-to-any-file: 'scripts/init.sh'
- any-glob-to-any-file: 'scripts/init-without-ocr.sh'
- any-glob-to-any-file: 'scripts/installFonts.sh'
- any-glob-to-any-file: 'test.sh'
- any-glob-to-any-file: 'test2.sh'

Test:
- changed-files:
1 change: 1 addition & 0 deletions .github/scripts/requirements_sync_readme.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tomlkit
10 changes: 10 additions & 0 deletions .github/scripts/requirements_sync_readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --generate-hashes --output-file='.github\scripts\requirements_sync_readme.txt' '.github\scripts\requirements_sync_readme.in'
#
tomlkit==0.13.2 \
--hash=sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde \
--hash=sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79
# via -r .github\scripts\requirements_sync_readme.in
16 changes: 14 additions & 2 deletions .github/workflows/PR-Demo-Comment.yml
Original file line number Diff line number Diff line change
@@ -4,9 +4,15 @@ on:
issue_comment:
types: [created]

permissions:
contents: read

jobs:
check-comment:
runs-on: ubuntu-latest
permissions:
pull-requests: read
issues: read
if: |
github.event.issue.pull_request &&
(
@@ -20,7 +26,8 @@ jobs:
github.event.comment.user.login == 'Ludy87' ||
github.event.comment.user.login == 'LaserKaspar' ||
github.event.comment.user.login == 'sbplat' ||
github.event.comment.user.login == 'reecebrowne'
github.event.comment.user.login == 'reecebrowne' ||
github.event.comment.user.login == 'DarioGii'
)
outputs:
pr_number: ${{ steps.get-pr.outputs.pr_number }}
@@ -68,6 +75,9 @@ jobs:
deploy-pr:
needs: check-comment
runs-on: ubuntu-latest
permissions:
pull-requests: write
issues: write

steps:
- name: Harden Runner
@@ -98,7 +108,9 @@ jobs:

- name: Get version number
id: versionNumber
run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
run: |
VERSION=$(grep "^version =" build.gradle | awk -F'"' '{print $2}')
echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
- name: Login to Docker Hub
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
3 changes: 2 additions & 1 deletion .github/workflows/PR-Demo-cleanup.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,8 @@ on:
pull_request:
types: [opened, synchronize, reopened, closed]

permissions: read-all
permissions:
contents: read

env:
SERVER_IP: ${{ secrets.VPS_IP }} # Add this to your GitHub secrets
3 changes: 2 additions & 1 deletion .github/workflows/auto-labeler.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@ on:
pull_request_target:
types: [opened, synchronize]

permissions: read-all
permissions:
contents: read

jobs:
labeler:
33 changes: 24 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -6,13 +6,15 @@ on:
pull_request:
branches: ["main"]

permissions: read-all
permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

permissions:
actions: read
security-events: write

strategy:
@@ -35,13 +37,26 @@ jobs:
java-version: ${{ matrix.jdk-version }}
distribution: "temurin"

- name: Set up Gradle
uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
with:
gradle-version: 8.7
- name: Build with Gradle and no spring security
run: ./gradlew clean build
env:
DOCKER_ENABLE_SECURITY: false

- name: Build with Gradle and with spring security
run: ./gradlew clean build
env:
DOCKER_ENABLE_SECURITY: true

- name: Build with Gradle
run: ./gradlew build --no-build-cache
- name: Upload Test Reports
if: always()
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: test-reports-jdk-${{ matrix.jdk-version }}
path: |
build/reports/tests/
build/test-results/
build/reports/problems/
retention-days: 3

docker-compose-tests:
# if: github.event_name == 'push' && github.ref == 'refs/heads/main' ||
@@ -80,7 +95,7 @@ jobs:

- name: Install Docker Compose
run: |
sudo curl -SL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo curl -SL "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Set up Python
@@ -90,7 +105,7 @@ jobs:

- name: Pip requirements
run: |
pip install -r ./cucumber/requirements.txt
pip install --require-hashes -r ./cucumber/requirements.txt
- name: Run Docker Compose Tests
run: |
Loading