File tree Expand file tree Collapse file tree 2 files changed +24
-3
lines changed Expand file tree Collapse file tree 2 files changed +24
-3
lines changed Original file line number Diff line number Diff line change 1
1
name : my-haskell-package
2
2
version : 0.1.0.0
3
- dependencies : [base >= 4.10 && <= 4.15, containers, text]
3
+
4
+ dependencies :
5
+ - name : base
6
+ version : ' >= 4.10 && <= 4.15'
7
+ - containers
8
+ - text
4
9
5
10
library :
6
11
exposed-modules : MyLib
Original file line number Diff line number Diff line change @@ -63,14 +63,30 @@ function parseBaseUpperBound(packageYamlPath) {
63
63
throw new Error ( "dependencies not found or invalid in package.yaml" ) ;
64
64
}
65
65
66
- const baseDep = deps . find ( dep => dep . startsWith ( "base" ) ) ;
66
+ const baseDep = deps . find ( dep => {
67
+ if ( typeof dep === "string" ) {
68
+ return dep . startsWith ( "base" ) ;
69
+ } else if ( typeof dep === "object" && dep . name ) {
70
+ return dep . name === "base" ;
71
+ }
72
+ return false ;
73
+ } ) ;
74
+
67
75
if ( ! baseDep ) {
68
76
githubCore . setFailed ( "No base dependency found in package.yaml" ) ;
77
+ return ;
78
+ }
79
+
80
+ let versionConstraint ;
81
+ if ( typeof baseDep === "string" ) {
82
+ versionConstraint = getBaseUpperBound ( baseDep ) ;
83
+ } else if ( typeof baseDep === "object" ) {
84
+ versionConstraint = getBaseUpperBound ( baseDep . version ) ;
69
85
}
70
86
71
- const versionConstraint = getBaseUpperBound ( baseDep ) ;
72
87
if ( ! versionConstraint ) {
73
88
githubCore . setFailed ( "No upper bound for base found in package.yaml" ) ;
89
+ return ;
74
90
}
75
91
76
92
return versionConstraint ;
You can’t perform that action at this time.
0 commit comments