Skip to content

Commit

Permalink
Issue #321: create bin/installSuperDoit.sh; update all of the github …
Browse files Browse the repository at this point in the history
…ci .yml scripts for tmate and new PATH definition
  • Loading branch information
dalehenrich committed Aug 21, 2021
1 parent ef5a5c7 commit 94a0541
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 29 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci-Client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,15 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.workflow_dispatch.ref }}
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
- name: Run tests
id: test_run
if: steps.last_run_status.outputs.last_run_status != 'success'
run: |
export GS_HOME="$(pwd)"
export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
export GS_TRAVIS=true
export JAVA="/usr/bin/java"
hostname
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci-Seaside3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ jobs:
- name: Install Chrome
run: |
sudo apt install google-chrome-stable
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
- name: Run tests
id: test_run
if: steps.last_run_status.outputs.last_run_status != 'success'
run: |
export GS_HOME="$(pwd)"
export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
export GS_TRAVIS=true
export JAVA="/usr/bin/java"
export CHROME_DRIVER_VERSION="90.0.4430.24"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci-SmalltalkCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,15 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.workflow_dispatch.ref }}
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
- name: Run tests
id: test_run
if: steps.last_run_status.outputs.last_run_status != 'success'
run: |
export GS_HOME="$(pwd)"
export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
export GS_TRAVIS=true
hostname
cat /etc/hosts
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci-UpgradeTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,15 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.workflow_dispatch.ref }}
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
- name: Run tests
id: test_run
if: steps.last_run_status.outputs.last_run_status != 'success'
run: |
export GS_HOME="$(pwd)"
export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
export GS_TRAVIS=true
hostname
cat /etc/hosts
Expand Down
2 changes: 1 addition & 1 deletion bin/defHOME_PATH.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pushd "$( dirname "${BASH_SOURCE[0]}" )" >& /dev/null
export GS_HOME=`pwd`
popd >& /dev/null
# put tests in the path for the near term ... remove before general release
export PATH="$GS_HOME/bin":$PATH
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH

12 changes: 0 additions & 12 deletions bin/defSUPERDOIT_PATH.env

This file was deleted.

55 changes: 55 additions & 0 deletions bin/installSuperDoit.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
i#! /usr/bin/env bash
#=========================================================================
# Copyright (c) 2015, 2016 GemTalk Systems, LLC <[email protected]>.
#
# MIT license: https://github.com/GsDevKit/GsDevKit_home/blob/master/license.txt
#=========================================================================

theArgs="$*"
source "${GS_HOME}/bin/private/shFeedback"
start_banner

usage() {
cat <<HELP
USAGE: $(basename $0)
DESCRIPTION
Install https://github.com/dalehenrich/superDoit in support of .solo and stone scripts
EXAMPLES
$(basename $0) -h
$(basename $0)
HELP
}

if [ "${GS_HOME}x" = "x" ] ; then
exit_1_banner "the GS_HOME environment variable needs to be defined"
fi
source "${GS_HOME}/bin/defGsDevKit.env"

while getopts "hc:o:" OPT ; do
case "$OPT" in
*) usage; exit_1_banner "Unknown option";;
esac
done
shift $(($OPTIND - 1))

if [ $# -ne 1 ]; then
usage; exit_1_banner "Wrong number of arguments (0 expected)"
fi

if [ ! -d "$GS_HOME/shared/gemstone/repos/superDoit" ] ; then
pushd $GS_HOME/shared/gemstone/repos
$GS_HOME/bin/downloadGemStone 3.6.1
$GS_HOME/bin/private/cloneGitHubProject -c https dalehenrich superDoit
cd superDoit/gemstone/gs
curl -L -O -s -S "https://github.com/dalehenrich/superDoit/releases/download/v0.1.0/3.6.1_extent0.solo.dbf.gz"
gunzip --stdout 3.6.1_extent0.solo.dbf.gz > extent0.solo.dbf
chmod -w extent0.solo.dbf
ln -s $GS_HOME/shared/downloads/products/GemStone64Bit3.6.1-* product
popd
fi

exit_0_banner "...finished"

10 changes: 1 addition & 9 deletions bin/setupGsDevKit
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,7 @@ setupType=$1
"$GS_HOME/bin/utils/cloneGsDevKitProjects" $modeArg $organizationArg $setupType
"$GS_HOME/bin/utils/cloneSharedTodeProjects" $modeArg $setupType

pushd $GS_HOME/shared/gemstone/repos
$GS_HOME/bin/downloadGemStone 3.6.1
$GS_HOME/bin/private/cloneGitHubProject -c https dalehenrich superDoit
cd superDoit/gemstone/gs
curl -L -O -s -S "https://github.com/dalehenrich/superDoit/releases/download/v0.1.0/3.6.1_extent0.solo.dbf.gz"
gunzip --stdout 3.6.1_extent0.solo.dbf.gz > extent0.solo.dbf
chmod -w extent0.solo.dbf
ln -s $GS_HOME/shared/downloads/products/GemStone64Bit3.6.1-* product
popd
"$$GS_HOME/bin/installSuperDoit.sh"

cat - > "$GS_HOME/bin/.gsdevkitSetup" << EOF
the presence of this file means that \$GS_HOME/bin/setupGsDevKit has
Expand Down
3 changes: 0 additions & 3 deletions tests/testTravisCI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ $GS_HOME/bin/private/clone_sys_local -c https
# Customize the scripts used by tODE (https://github.com/dalehenrich/tode/issues/226)
$GS_HOME/tests/travisCustomize.sh

## Prepare superdoit scripts
#$GS_HOME/tests/prepare_tests_superdoit.sh

if [ "${DOWNLOAD}x" != "x" ] ; then
downloadGemStone -f -d "${DOWNLOAD}" $GS_VERSION
fi
Expand Down

0 comments on commit 94a0541

Please sign in to comment.