Skip to content

Commit 6305cc4

Browse files
committed
fix: production items are deployed after all changed classes are compiled
1 parent e84bd10 commit 6305cc4

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ Method OnPull() As %Status
2424
write !, "WARNING: Deletion of ", ..ModifiedFiles(i).externalName, " failed."
2525
}
2626
} else {
27-
if (##class(SourceControl.Git.Utils).Type(internalName) '= "ptd") {
27+
set nFiles = nFiles + 1
28+
if (##class(SourceControl.Git.Utils).Type(internalName) = "ptd") {
29+
set ptdList(internalName) = ""
30+
} else {
2831
set compilelist(internalName) = ""
32+
set sc = $$$ADDSC(sc,##class(SourceControl.Git.Utils).ImportItem(internalName, 1))
2933
}
30-
set nFiles = nFiles + 1
31-
set sc = $$$ADDSC(sc,##class(SourceControl.Git.Utils).ImportItem(internalName, 1))
3234
}
3335
}
3436

@@ -37,6 +39,12 @@ Method OnPull() As %Status
3739
quit $$$OK
3840
}
3941
set sc = $$$ADDSC(sc,$system.OBJ.CompileList(.compilelist, "ck"))
42+
// after compilation, deploy any PTD items
43+
set key = $order(ptdList(""))
44+
while (key '= "") {
45+
set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(key,1))
46+
set key = $order(ptdList(key))
47+
}
4048
if $$$comClassDefined("Ens.Director") && ##class(Ens.Director).IsProductionRunning() {
4149
write !,"Updating production... "
4250
set sc = $$$ADDSC(sc,##class(Ens.Director).UpdateProduction())

0 commit comments

Comments
 (0)