@@ -87,10 +87,9 @@ func (h *Hashrelease) URL() string {
87
87
//
88
88
// 3. It sets it as the latest for its product stream if specified.
89
89
func Publish (productCode string , h * Hashrelease , cfg * Config ) error {
90
- srcDir := strings .TrimSuffix (h .Source , "/" ) + "/"
91
90
logrus .WithFields (logrus.Fields {
92
91
"hashrelease" : h .Name ,
93
- "srcDir" : srcDir ,
92
+ "srcDir" : h . Source ,
94
93
"latest" : h .Latest ,
95
94
}).Info ("Publishing hashrelease" )
96
95
@@ -119,14 +118,18 @@ func publishFiles(h *Hashrelease, cfg *Config) error {
119
118
logrus .WithFields (logrus.Fields {
120
119
"hashrelease" : h .Name ,
121
120
"srcDir" : h .Source ,
122
- }).Info ("Publishing hashrelease" )
121
+ }).Info ("Publishing hashrelease files " )
123
122
var allErr error
124
123
// publish to the server via SSH
125
- logrus .WithField ("hashrelease" , h .Name ).Debug ("Publishing hashrelease via SSH" )
124
+ srcDir := strings .TrimSuffix (h .Source , "/" ) + "/"
125
+ logrus .WithFields (logrus.Fields {
126
+ "hashrelease" : h .Name ,
127
+ "srcDir" : srcDir ,
128
+ }).Debug ("Publishing hashrelease via SSH" )
126
129
if _ , err := command .Run ("rsync" ,
127
130
[]string {
128
131
"--stats" , "-az" , "--delete" ,
129
- fmt .Sprintf ("--rsh=%s" , cfg .RSHCommand ()), h . Source ,
132
+ fmt .Sprintf ("--rsh=%s" , cfg .RSHCommand ()), srcDir ,
130
133
fmt .Sprintf ("%s:%s/%s" , cfg .HostString (), RemoteDocsPath (cfg .User ), h .Name ),
131
134
}); err != nil {
132
135
logrus .WithError (err ).Error ("Failed to publish hashrelease via SSH" )
@@ -138,7 +141,10 @@ func publishFiles(h *Hashrelease, cfg *Config) error {
138
141
logrus .WithError (err ).Error ("Failed to get credentials email for hashrelease server" )
139
142
return errors .Join (allErr , fmt .Errorf ("failed to get credentials email for hashrelease server: %w" , err ))
140
143
}
141
- logrus .WithField ("hashrelease" , h .Name ).Debug ("Publishing hashrelease to cloud storage" )
144
+ logrus .WithFields (logrus.Fields {
145
+ "hashrelease" : h .Name ,
146
+ "srcDir" : h .Source ,
147
+ }).Debug ("Publishing hashrelease to cloud storage" )
142
148
args := []string {
143
149
"storage" , "rsync" ,
144
150
h .Source , fmt .Sprintf ("gs://%s/%s" , cfg .BucketName , h .Name ),
0 commit comments