Skip to content

Commit

Permalink
update ci.yml and test scripts to allow for testings versions other t…
Browse files Browse the repository at this point in the history
…han 3.7.0 ... find out how versions 3.6.4-3.6.6 fare
  • Loading branch information
dalehenrich committed Oct 3, 2023
1 parent 422ca8b commit d6c4ee5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
# os: [ ubuntu-20.04, macos-latest ]
os: [ macos-latest ]
smalltalk: [ 3.7.0 ]
os: [ ubuntu-20.04, macos-latest ]
smalltalk: [ 3.6.4, 3.6.5, 3.6.6, 3.7.0 ]
runs-on: ${{ matrix.os }}
env:
GS_VERS: ${{ matrix.smalltalk }}
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ BRANCH | STATUS
------------- | -------------
**v1.1.1** | [![**v1.1.1** build status](https://github.com/GsDevKit/GsDevKit_stones/actions/workflows/ci.yml/badge.svg?branch=v1.1.1)](https://github.com/GsDevKit/GsDevKit_stones/actions)

## Versions
### v1.1.1
Development version intended for use with superDoit:v4.1 and GemStone 3.7.0.

Greatly simplified version of GsDevKit_home
1. bin directory of scripts implemented with superDoit and 3.6.5 for solo scripts and GsHostProcess ala the .solo battery test drivers used internally
2. stone directory modeled after GsDevKit_home, but configurable for folks with different needs … some sort of template for definition of directory structure
Expand Down
22 changes: 11 additions & 11 deletions tests/test_defaultRegistry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ else
# rm -rf $STONES_HOME/test_gemstone/*
fi
registerProductDirectory.solo --productDirectory=$STONES_HOME/test_gemstone $*
# download 3.7.0
downloadGemStone.solo 3.7.0 $*
# download $GS_VERS
downloadGemStone.solo $GS_VERS $*
# update product list from shared product directory when a download is done by shared registry
registerProduct.solo --fromDirectory=$STONES_HOME/test_gemstone $*

Expand All @@ -97,44 +97,44 @@ fi

registerStonesDirectory.solo --stonesDirectory=$STONES_HOME/test_stones/stones $*

# create a 3.7.0 Rowan stone and install GsDevKit_home
createStone.solo --template=minimal_rowan gs_370 3.7.0 $*
# create a $GS_VERS Rowan stone and install GsDevKit_home
createStone.solo --template=minimal_rowan gs_rowan $GS_VERS $*

echo $PLATFORM
set -x
if [ "$CI" = "true" ]; then
# possible native code generation issues on mac and github, disable native code
echo "NATIVE CODE*************************************"
cat $STONES_HOME/test_stones/stones/gs_370/gem.conf
cat $STONES_HOME/test_stones/stones/gs_rowan/gem.conf
if [[ "$PLATFORM" = "macos"* ]]; then
cat - >> $STONES_HOME/test_stones/stones/gs_370/gem.conf << EOF
cat - >> $STONES_HOME/test_stones/stones/gs_rowan/gem.conf << EOF
GEM_NATIVE_CODE_ENABLED=0;
EOF
fi
cat $STONES_HOME/test_stones/stones/gs_370/gem.conf
cat $STONES_HOME/test_stones/stones/gs_rowan/gem.conf
echo "NATIVE CODE*************************************"
fi
set +x

#start stone
startStone.solo gs_370 $*
startStone.solo gs_rowan $*

# Add ROWAN_PROJECTS_HOME env var to point to the git directory where git repositories
# used by this stone reside
# restart netldi, so env var available to JadeiteForPharo
export ROWAN_PROJECTS_HOME=$STONES_HOME/test_git
updateCustomEnv.solo gs_370 --addKey=ROWAN_PROJECTS_HOME --value=$ROWAN_PROJECTS_HOME --restart $*
updateCustomEnv.solo gs_rowan --addKey=ROWAN_PROJECTS_HOME --value=$ROWAN_PROJECTS_HOME --restart $*

gslist.solo -l

cd $STONES_HOME/test_stones/stones/gs_370
cd $STONES_HOME/test_stones/stones/gs_rowan

# install GsDevKit_stones using Rowan installProject.stone script
bin/installProject.stone file:$GSDEVKIT_STONES_ROOT/rowan/specs/GsDevKit_stones.ston \
--projectsHome=$GSDEVKIT_STONES_ROOT/.. $*

# delete the stone
cd $STONES_HOME
deleteStone.solo gs_370 $*
deleteStone.solo gs_rowan $*
gslist.solo -l

0 comments on commit d6c4ee5

Please sign in to comment.