Skip to content

Commit 94a0541

Browse files
dalehenrichdalehenrich
committed
Issue #321: create bin/installSuperDoit.sh; update all of the github ci .yml scripts for tmate and new PATH definition
1 parent ef5a5c7 commit 94a0541

9 files changed

+73
-29
lines changed

‎.github/workflows/ci-Client.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,15 @@ jobs:
9191
- uses: actions/checkout@v2
9292
with:
9393
ref: ${{ github.event.workflow_dispatch.ref }}
94+
- name: Setup tmate session
95+
uses: mxschmitt/action-tmate@v3
96+
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
9497
- name: Run tests
9598
id: test_run
9699
if: steps.last_run_status.outputs.last_run_status != 'success'
97100
run: |
98101
export GS_HOME="$(pwd)"
99-
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
102+
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
100103
export GS_TRAVIS=true
101104
export JAVA="/usr/bin/java"
102105
hostname

‎.github/workflows/ci-Seaside3.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,15 @@ jobs:
4646
- name: Install Chrome
4747
run: |
4848
sudo apt install google-chrome-stable
49+
- name: Setup tmate session
50+
uses: mxschmitt/action-tmate@v3
51+
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
4952
- name: Run tests
5053
id: test_run
5154
if: steps.last_run_status.outputs.last_run_status != 'success'
5255
run: |
5356
export GS_HOME="$(pwd)"
54-
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
57+
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
5558
export GS_TRAVIS=true
5659
export JAVA="/usr/bin/java"
5760
export CHROME_DRIVER_VERSION="90.0.4430.24"

‎.github/workflows/ci-SmalltalkCI.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,15 @@ jobs:
5050
- uses: actions/checkout@v2
5151
with:
5252
ref: ${{ github.event.workflow_dispatch.ref }}
53+
- name: Setup tmate session
54+
uses: mxschmitt/action-tmate@v3
55+
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
5356
- name: Run tests
5457
id: test_run
5558
if: steps.last_run_status.outputs.last_run_status != 'success'
5659
run: |
5760
export GS_HOME="$(pwd)"
58-
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
61+
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
5962
export GS_TRAVIS=true
6063
hostname
6164
cat /etc/hosts

‎.github/workflows/ci-UpgradeTests.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,15 @@ jobs:
100100
- uses: actions/checkout@v2
101101
with:
102102
ref: ${{ github.event.workflow_dispatch.ref }}
103+
- name: Setup tmate session
104+
uses: mxschmitt/action-tmate@v3
105+
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
103106
- name: Run tests
104107
id: test_run
105108
if: steps.last_run_status.outputs.last_run_status != 'success'
106109
run: |
107110
export GS_HOME="$(pwd)"
108-
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
111+
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
109112
export GS_TRAVIS=true
110113
hostname
111114
cat /etc/hosts

‎bin/defHOME_PATH.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ pushd "$( dirname "${BASH_SOURCE[0]}" )" >& /dev/null
88
export GS_HOME=`pwd`
99
popd >& /dev/null
1010
# put tests in the path for the near term ... remove before general release
11-
export PATH="$GS_HOME/bin":$PATH
11+
export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
1212

‎bin/defSUPERDOIT_PATH.env

-12
This file was deleted.

‎bin/installSuperDoit.sh

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
i#! /usr/bin/env bash
2+
#=========================================================================
3+
# Copyright (c) 2015, 2016 GemTalk Systems, LLC <[email protected]>.
4+
#
5+
# MIT license: https://github.com/GsDevKit/GsDevKit_home/blob/master/license.txt
6+
#=========================================================================
7+
8+
theArgs="$*"
9+
source "${GS_HOME}/bin/private/shFeedback"
10+
start_banner
11+
12+
usage() {
13+
cat <<HELP
14+
USAGE: $(basename $0)
15+
16+
DESCRIPTION
17+
Install https://github.com/dalehenrich/superDoit in support of .solo and stone scripts
18+
19+
EXAMPLES
20+
$(basename $0) -h
21+
$(basename $0)
22+
23+
HELP
24+
}
25+
26+
if [ "${GS_HOME}x" = "x" ] ; then
27+
exit_1_banner "the GS_HOME environment variable needs to be defined"
28+
fi
29+
source "${GS_HOME}/bin/defGsDevKit.env"
30+
31+
while getopts "hc:o:" OPT ; do
32+
case "$OPT" in
33+
*) usage; exit_1_banner "Unknown option";;
34+
esac
35+
done
36+
shift $(($OPTIND - 1))
37+
38+
if [ $# -ne 1 ]; then
39+
usage; exit_1_banner "Wrong number of arguments (0 expected)"
40+
fi
41+
42+
if [ ! -d "$GS_HOME/shared/gemstone/repos/superDoit" ] ; then
43+
pushd $GS_HOME/shared/gemstone/repos
44+
$GS_HOME/bin/downloadGemStone 3.6.1
45+
$GS_HOME/bin/private/cloneGitHubProject -c https dalehenrich superDoit
46+
cd superDoit/gemstone/gs
47+
curl -L -O -s -S "https://github.com/dalehenrich/superDoit/releases/download/v0.1.0/3.6.1_extent0.solo.dbf.gz"
48+
gunzip --stdout 3.6.1_extent0.solo.dbf.gz > extent0.solo.dbf
49+
chmod -w extent0.solo.dbf
50+
ln -s $GS_HOME/shared/downloads/products/GemStone64Bit3.6.1-* product
51+
popd
52+
fi
53+
54+
exit_0_banner "...finished"
55+

‎bin/setupGsDevKit

+1-9
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,7 @@ setupType=$1
5959
"$GS_HOME/bin/utils/cloneGsDevKitProjects" $modeArg $organizationArg $setupType
6060
"$GS_HOME/bin/utils/cloneSharedTodeProjects" $modeArg $setupType
6161

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

7264
cat - > "$GS_HOME/bin/.gsdevkitSetup" << EOF
7365
the presence of this file means that \$GS_HOME/bin/setupGsDevKit has

‎tests/testTravisCI.sh

-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ $GS_HOME/bin/private/clone_sys_local -c https
3030
# Customize the scripts used by tODE (https://github.com/dalehenrich/tode/issues/226)
3131
$GS_HOME/tests/travisCustomize.sh
3232

33-
## Prepare superdoit scripts
34-
#$GS_HOME/tests/prepare_tests_superdoit.sh
35-
3633
if [ "${DOWNLOAD}x" != "x" ] ; then
3734
downloadGemStone -f -d "${DOWNLOAD}" $GS_VERSION
3835
fi

0 commit comments

Comments
 (0)