Skip to content

Commit 9c11b03

Browse files
committed
have to do a fetch before a switch to make sure the branch is available; typo in list of attributes for loading tests in bin/attachRowanDevClones.stone
1 parent 5be5f7c commit 9c11b03

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

Diff for: bin/attachRowanDevClones.stone

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ attachDevClonesV3: projectsHome
138138
gitUrl: 'file:', (((projectsHome, '/', loadSpec projectAlias) asFileReference / relRoot) pathString);
139139
projectsHome: projectsHome;
140140
yourself ].
141-
loadSpec addCustomConditionalAttributes: #('tests' 'testsv2') ].
141+
loadSpec addCustomConditionalAttributes: #('tests' 'testsV2') ].
142142
projectNames := loadSpecs load projectNames asArray sort.
143143
self logMessage: 'Rowan projects attached and reloaded: '.
144144
projectNames do: [:each |

Diff for: rowan/components/GLASS-37x.ston

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ RwPlatformNestedProjectLoadComponentV2 {
77
'GsDevKit_stones-GLASS-37x'
88
],
99
#comment : 'GLASS gs3.[7-] packages '
10-
}
10+
}

Diff for: src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st

+9-1
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,16 @@ cloneOrUpdateProject: projectDirName remoteName: remoteName in: gitRootPath pull
4848
ifFalse: [
4949
pull
5050
ifTrue: [
51-
"GIT SWITCH
51+
"GIT FETCH
52+
GIT SWITCH
5253
GIT PULL"
54+
Transcript
55+
cr;
56+
show: ' Fetch --all '.
57+
gitTool gitfetchIn: gitProjectRef with: ' --all'.
58+
Transcript
59+
cr;
60+
show: ' Switch ', remoteName , '/' , revision , ' -t -C ' , revision.
5361
gitTool
5462
performGitCommand: 'switch'
5563
in: gitProjectRef fullName

0 commit comments

Comments
 (0)