From 7ecd14a6c91a65d309a741152f1e298c32a69bcc Mon Sep 17 00:00:00 2001 From: Kilian B <60846047+knowbased@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:37:00 +0200 Subject: [PATCH] fix: put s3 pharo library in baseline (#34) * chore: add aws and voyage in baseline requirement * chore: useLoaded for conflict in .smalltalk.ston --- .smalltalk.ston | 2 +- src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.smalltalk.ston b/.smalltalk.ston index 45bd543..0b19fe0 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -6,7 +6,7 @@ SmalltalkCISpec { #directory : 'src', #load : [ 'default', 'Jira' ], #platforms : [ #pharo ], - #onConflict : #useIncoming, + #onConflict : #useLoaded, #onUpgrade : #useIncoming } ], diff --git a/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st b/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st index cdaad70..be2c453 100644 --- a/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st +++ b/src/BaselineOfGitLabHealth/BaselineOfGitLabHealth.class.st @@ -128,7 +128,7 @@ BaselineOfGitLabHealth >> definePackages: spec [ package: 'GLPHExtended-Model-Extension' with: [ spec requires: #( 'GLPHExtended-Model' 'GitLabHealth-Model' 'GitLabHealth-Model-Extension' ) ]; - package: 'GitLabHealth-Model-Analysis'; + package: 'GitLabHealth-Model-Analysis' with: [ spec requires: #( 'Voyage' 'AWS' ) ]; package: 'GitLabHealth-Model-Analysis-Tests' with: [ spec requires: #( 'GitLabHealth-Model-Analysis' ) ]; package: 'GitLabHealth-Visualization';