Skip to content

Commit 0dd9bbe

Browse files
authored
Merge pull request #39 from isimluk/oval-xsd-integration
CI: Oval xsd integration
2 parents 1c27e68 + 68c81ab commit 0dd9bbe

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/scap.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ pushd $workdir
2525
$xsd2go convert \
2626
--xmlns-override=http://cpe.mitre.org/language/2.0=cpe_language \
2727
.scap_schemas/schemas/xccdf/1.2/xccdf_1.2.xsd github.com/gocomply/scap pkg/scap/models
28+
$xsd2go convert .scap_schemas/schemas/oval/5.11.3/oval-results-schema.xsd github.com/gocomply/scap pkg/scap/models
2829

2930
# Ensure the code can be compiled
3031
go vet ./...

pkg/xsd/element.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (e *Element) GoTypeName() string {
8080
}
8181

8282
func (e *Element) GoForeignModule() string {
83-
if e.isPlainString() {
83+
if e.isPlainString() && e.refElm == nil && e.typ == nil {
8484
return ""
8585
}
8686

0 commit comments

Comments
 (0)