From d6c4ee56457b1ff049760d424cb726b92c3feadd Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Tue, 3 Oct 2023 16:19:17 -0700 Subject: [PATCH] update ci.yml and test scripts to allow for testings versions other than 3.7.0 ... find out how versions 3.6.4-3.6.6 fare --- .github/workflows/ci.yml | 5 ++--- README.md | 4 ++++ tests/test_defaultRegistry.sh | 22 +++++++++++----------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b889899..d810bb8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/README.md b/README.md index f99a95cb..7770ffed 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/tests/test_defaultRegistry.sh b/tests/test_defaultRegistry.sh index a13d2668..a216f119 100755 --- a/tests/test_defaultRegistry.sh +++ b/tests/test_defaultRegistry.sh @@ -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 $* @@ -97,37 +97,37 @@ 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 \ @@ -135,6 +135,6 @@ bin/installProject.stone file:$GSDEVKIT_STONES_ROOT/rowan/specs/GsDevKit_stones. # delete the stone cd $STONES_HOME -deleteStone.solo gs_370 $* +deleteStone.solo gs_rowan $* gslist.solo -l