create separate run sections for each of the scripts ... to simplify …

…understanding failures ... remove the error when --update attempted
GsDevKit · Oct 6, 2023 · 962b7ff · 962b7ff
1 parent 19af239
commit 962b7ff
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
           gslist.solo -l
 
         shell: bash
-      - name: run smoke tests
+      - name: run help test
         run: |
           export GEMSTONE_ROOT=${{ steps.setup-GsDevKit_stones.outputs.gemstone-product-path }}
           export SUPERDOIT_ROOT=${{ steps.setup-GsDevKit_stones.outputs.superDoit-root }}
@@ -123,8 +123,86 @@ jobs:
 
           export CI="true"
           $GSDEVKIT_STONES_ROOT/tests/test_help.sh
+        shell: bash
+      - name: run projet sets
+        run: |
+          export GEMSTONE_ROOT=${{ steps.setup-GsDevKit_stones.outputs.gemstone-product-path }}
+          export SUPERDOIT_ROOT=${{ steps.setup-GsDevKit_stones.outputs.superDoit-root }}
+          export WORK_ROOT="$GITHUB_WORKSPACE/.."
+          export GSDEVKIT_STONES_ROOT=$GITHUB_WORKSPACE
+
+          echo "GEMSTONE_ROOT=$GEMSTONE_ROOT"
+          echo "SUPERDOIT_ROOT=$SUPERDOIT_ROOT"
+          echo "GSDEVKIT_STONES_ROOT=$GSDEVKIT_STONES_ROOT"
+          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE"
+          echo "WORK_ROOT=$WORK_ROOT"          
+
+          export STONES_DATA_HOME="$WORK_ROOT/STONES_DATA_HOME"
+          echo "STONES_DATA_HOME=$STONES_DATA_HOME"
+
+          export STONES_HOME="$WORK_ROOT/STONES_HOME"
+          echo "STONES_HOME=$STONES_HOME"
+
+          export STONES_git=$STONES_HOME/git
+          export STONES_gemstone=$STONES_HOME/gemstone
+
+          export PATH=$SUPERDOIT_ROOT/bin:$GSDEVKIT_STONES_ROOT/bin:$PATH
+
+          export CI="true"
           $GSDEVKIT_STONES_ROOT/tests/test_projectSets.sh
+         shell: bash
+      - name: run default registry
+        run: |
+          export GEMSTONE_ROOT=${{ steps.setup-GsDevKit_stones.outputs.gemstone-product-path }}
+          export SUPERDOIT_ROOT=${{ steps.setup-GsDevKit_stones.outputs.superDoit-root }}
+          export WORK_ROOT="$GITHUB_WORKSPACE/.."
+          export GSDEVKIT_STONES_ROOT=$GITHUB_WORKSPACE
+
+          echo "GEMSTONE_ROOT=$GEMSTONE_ROOT"
+          echo "SUPERDOIT_ROOT=$SUPERDOIT_ROOT"
+          echo "GSDEVKIT_STONES_ROOT=$GSDEVKIT_STONES_ROOT"
+          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE"
+          echo "WORK_ROOT=$WORK_ROOT"          
+
+          export STONES_DATA_HOME="$WORK_ROOT/STONES_DATA_HOME"
+          echo "STONES_DATA_HOME=$STONES_DATA_HOME"
+
+          export STONES_HOME="$WORK_ROOT/STONES_HOME"
+          echo "STONES_HOME=$STONES_HOME"
+
+          export STONES_git=$STONES_HOME/git
+          export STONES_gemstone=$STONES_HOME/gemstone
+
+          export PATH=$SUPERDOIT_ROOT/bin:$GSDEVKIT_STONES_ROOT/bin:$PATH
+
+          export CI="true"
           $GSDEVKIT_STONES_ROOT/tests/test_defaultRegistry.sh
+        shell: bash
+      - name: run rowanV3-alpha1
+        run: |
+          export GEMSTONE_ROOT=${{ steps.setup-GsDevKit_stones.outputs.gemstone-product-path }}
+          export SUPERDOIT_ROOT=${{ steps.setup-GsDevKit_stones.outputs.superDoit-root }}
+          export WORK_ROOT="$GITHUB_WORKSPACE/.."
+          export GSDEVKIT_STONES_ROOT=$GITHUB_WORKSPACE
+
+          echo "GEMSTONE_ROOT=$GEMSTONE_ROOT"
+          echo "SUPERDOIT_ROOT=$SUPERDOIT_ROOT"
+          echo "GSDEVKIT_STONES_ROOT=$GSDEVKIT_STONES_ROOT"
+          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE"
+          echo "WORK_ROOT=$WORK_ROOT"          
+
+          export STONES_DATA_HOME="$WORK_ROOT/STONES_DATA_HOME"
+          echo "STONES_DATA_HOME=$STONES_DATA_HOME"
+
+          export STONES_HOME="$WORK_ROOT/STONES_HOME"
+          echo "STONES_HOME=$STONES_HOME"
+
+          export STONES_git=$STONES_HOME/git
+          export STONES_gemstone=$STONES_HOME/gemstone
+
+          export PATH=$SUPERDOIT_ROOT/bin:$GSDEVKIT_STONES_ROOT/bin:$PATH
+
+          export CI="true"
           $GSDEVKIT_STONES_ROOT/tests/test_rowanV3_alpha.sh
         shell: bash
   slack-workflow-status:

diff --git a/...nes-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st b/...nes-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.pull..st
@@ -31,17 +31,20 @@ cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath pull: p
 				show: '  Set ' , projectName , ' revision to ' , revision.
 			cloned
 				ifTrue: [ 
-					"git switch remote/revision -t -C revision"
+					"GIT SWITCH"
 					gitTool
 						performGitCommand: 'switch'
 						in: gitProjectRef fullName
 						with: ' ' , remoteName , '/' , revision , ' -t -C ' , revision ]
 				ifFalse: [ 
 					pull
 						ifTrue: [ 
-							self
-								error:
-									'Not safely implemented ... yet. Have to do more checking before a pull is safe '.	"GIT PULL"
+							"GIT SWITCH
+								GIT PULL"
+							gitTool
+								performGitCommand: 'switch'
+								in: gitProjectRef fullName
+								with: ' ' , remoteName , '/' , revision , ' -t -C ' , revision.
 							Transcript
 								cr;
 								show: