Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit d5bfef9

Browse files
MickMakeMickMake
committed
updated
1 parent a562edf commit d5bfef9

File tree

9 files changed

+213
-103
lines changed

9 files changed

+213
-103
lines changed

‎.idea/workspace.xml‎

Lines changed: 62 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ endif
2626
@$(GODOCMD)
2727

2828

29-
test:
29+
test-run:
3030
@./bin/deploywp run --chdir --json tests/deploywp.json prod
3131

3232

33+
test-template:
34+
#@./bin/deploywp load tests/deploywp.json prod
35+
@./tests/deploywp.tmpl prod
36+
37+
3338
docker:
3439
@docker build -f docker/Dockerfile .
3540

‎jsonTemplate/helpers/deploywp/helpers_highlevel.go‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (e *TypeDeployWp) CheckoutSourceRepo(gitRef *helperGit.HelperGit) *ux.State
146146
}
147147

148148
if gitRef.IsNotExisting() {
149-
e.State.SetError("deploywp JSON is nil")
149+
e.State.SetError("source repository not open")
150150
break
151151
}
152152

@@ -167,19 +167,26 @@ func (e *TypeDeployWp) CheckoutSourceRepo(gitRef *helperGit.HelperGit) *ux.State
167167
ux.PrintfOk("Type: '%s'\n", refType)
168168
ux.PrintfOk("Name: '%s'\n", refName)
169169

170-
ux.PrintfBlue("# Checking if %s exists.\n", refType)
171-
e.State = gitRef.TagExists(refName)
172-
if e.State.IsError() {
173-
break
170+
ux.PrintfBlue("# Checking if %s '%s' exists.\n", refType, refName)
171+
if refType == "branch" {
172+
e.State = gitRef.BranchExists(refName)
173+
if e.State.IsError() {
174+
break
175+
}
176+
} else {
177+
e.State = gitRef.TagExists(refName)
178+
if e.State.IsError() {
179+
break
180+
}
174181
}
175182

176-
ux.PrintfBlue("# Checking out %s:%s.\n", refType, refName)
177-
e.State = gitRef.TagExists(refName)
183+
ux.PrintfBlue("# Checking out %s '%s'.\n", refType, refName)
184+
e.State = gitRef.GitCheckout(refName)
178185
if e.State.IsError() {
179186
break
180187
}
181188

182-
ux.PrintfOk("# Source repository opened OK.\n")
189+
ux.PrintfOk("# %s '%s' checked out OK.\n", refType, refName)
183190
e.State.Clear()
184191
}
185192

‎jsonTemplate/helpers/deploywp/helpers_workflow.go‎

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package deploywp
33
import (
44
"github.com/wplib/deploywp/only"
55
"github.com/wplib/deploywp/ux"
6+
"time"
67
)
78

89
/*
@@ -128,16 +129,90 @@ func (e *TypeDeployWp) Run() *ux.State {
128129
ux.PrintfWhite("\n\n")
129130

130131

132+
ux.PrintfWhite("##############################\n")
133+
ux.PrintfWhite("# Checkout source repository #\n")
134+
ux.PrintfWhite("##############################\n")
135+
srcGitRef.State = e.CheckoutSourceRepo(srcGitRef)
136+
if e.State.IsError() {
137+
break
138+
}
139+
ux.PrintfWhite("\n\n")
140+
141+
131142
ux.PrintfWhite("#############################\n")
132143
ux.PrintfWhite("# Opening target repository #\n")
133144
ux.PrintfWhite("#############################\n")
134-
srcGitRef.State = e.CheckoutSourceRepo(srcGitRef)
145+
srcGitRef.State = e.OpenTargetRepo()
146+
if e.State.IsError() {
147+
break
148+
}
149+
ux.PrintfWhite("\n\n")
150+
151+
152+
ux.PrintfWhite("##############################\n")
153+
ux.PrintfWhite("# Cleaning target repository #\n")
154+
ux.PrintfWhite("##############################\n")
155+
//srcGitRef.State = e.OpenTargetRepo()
156+
time.Sleep(time.Second * 2) // Simulate
157+
if e.State.IsError() {
158+
break
159+
}
160+
ux.PrintfWhite("\n\n")
161+
162+
163+
ux.PrintfWhite("#############################\n")
164+
ux.PrintfWhite("# Syncing target repository #\n")
165+
ux.PrintfWhite("#############################\n")
166+
//srcGitRef.State = e.OpenTargetRepo()
167+
time.Sleep(time.Second * 2) // Simulate
135168
if e.State.IsError() {
136169
break
137170
}
138171
ux.PrintfWhite("\n\n")
139172

140173

174+
ux.PrintfWhite("#########################################\n")
175+
ux.PrintfWhite("# Running composer on target repository #\n")
176+
ux.PrintfWhite("#########################################\n")
177+
//srcGitRef.State = e.OpenTargetRepo()
178+
time.Sleep(time.Second * 2) // Simulate
179+
if e.State.IsError() {
180+
break
181+
}
182+
ux.PrintfWhite("\n\n")
183+
184+
185+
ux.PrintfWhite("############################################\n")
186+
ux.PrintfWhite("# Increment BUILD within target repository #\n")
187+
ux.PrintfWhite("############################################\n")
188+
//srcGitRef.State = e.OpenTargetRepo()
189+
time.Sleep(time.Second * 2) // Simulate
190+
if e.State.IsError() {
191+
break
192+
}
193+
ux.PrintfWhite("\n\n")
194+
195+
196+
ux.PrintfWhite("########################################\n")
197+
ux.PrintfWhite("# Commit target repository to Pantheon #\n")
198+
ux.PrintfWhite("########################################\n")
199+
//srcGitRef.State = e.OpenTargetRepo()
200+
time.Sleep(time.Second * 2) // Simulate
201+
if e.State.IsError() {
202+
break
203+
}
204+
ux.PrintfWhite("\n\n")
205+
206+
207+
ux.PrintfWhite("############################\n")
208+
ux.PrintfWhite("# Commit source repository #\n")
209+
ux.PrintfWhite("############################\n")
210+
//srcGitRef.State = e.OpenTargetRepo()
211+
time.Sleep(time.Second * 2) // Simulate
212+
if e.State.IsError() {
213+
break
214+
}
215+
ux.PrintfWhite("\n\n")
141216
}
142217

143218
return e.State

0 commit comments

Comments
 (0)