Skip to content

Commit

Permalink
Merge branch 'master' into ease-pharo-management-in-baseline
Browse files Browse the repository at this point in the history
  • Loading branch information
@jecisc
jecisc authored Oct 11, 2023
2 parents e285ed1 + fe12829 commit 7039fea
Show file tree
Hide file tree
Showing 62 changed files with 913 additions and 414 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- Squeak32-4.5
- Pharo64-stable
- Pharo64-alpha
- Pharo64-12
- Pharo64-11
- Pharo64-10
- Pharo64-9.0
Expand All @@ -41,11 +42,17 @@ jobs:
- Pharo32-stable
- Pharo32-alpha
- Pharo32-3.0
- Moose64-11
- Moose64-10
- Moose64-9.0
- Moose64-8.0
- GemStone64-3.5.3
- GemStone64-3.5.8
- GemStone64-3.6.0
- GemStone64-3.6.5
- GToolkit64-release
timeout-minutes: [ 15 ]
exclude: # exclude 32bit builds on macOS
exclude: # exclude 32bit builds on macOS and GemStone builds on windows
- os: macos-latest
smalltalk: Squeak32-trunk
- os: macos-latest
Expand All @@ -62,10 +69,14 @@ jobs:
smalltalk: Pharo64-10
- os: windows-2019
smalltalk: Pharo64-6.0
include:
- os: ubuntu-18.04
smalltalk: GemStone64-3.5.0
timeout-minutes: 30
- os: windows-2019
smalltalk: GemStone64-3.5.3
- os: windows-2019
smalltalk: GemStone64-3.5.8
- os: windows-2019
smalltalk: GemStone64-3.6.0
- os: windows-2019
smalltalk: GemStone64-3.6.5
runs-on: ${{ matrix.os }}
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
steps:
Expand All @@ -79,14 +90,14 @@ jobs:
tests/all_tests.sh
bin/smalltalkci -s ${{ matrix.smalltalk }} --self-test
shell: bash
if: contains(matrix.smalltalk, 'trunk') == false && contains(matrix.smalltalk, 'alpha') == false && contains(matrix.smalltalk, 'Squeak32-6.0') == false
if: contains(matrix.smalltalk, 'trunk') == false && contains(matrix.smalltalk, 'alpha') == false && contains(matrix.smalltalk, 'Squeak32-6.0') == false && contains(matrix.smalltalk, 'GToolkit64') == false
timeout-minutes: ${{ matrix.timeout-minutes }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run smalltalkCI self test and ignore failures
run: bin/smalltalkci -s ${{ matrix.smalltalk }} --self-test || true
shell: bash
if: contains(matrix.smalltalk, 'trunk') || contains(matrix.smalltalk, 'alpha') || contains(matrix.smalltalk, 'Squeak32-6.0')
if: contains(matrix.smalltalk, 'trunk') || contains(matrix.smalltalk, 'alpha') || contains(matrix.smalltalk, 'Squeak32-6.0') || contains(matrix.smalltalk, 'GToolkit64')
timeout-minutes: ${{ matrix.timeout-minutes }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71 changes: 43 additions & 28 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,30 +72,31 @@ they can take up a lot of space on your drive.*

## <a name="images"/>List of Supported Images

| [Squeak][squeak] | [Pharo][pharo] | [GemStone][gemstone] | [Moose][moose] |
| ---------------- | ---------------- | -------------------- | --------------- |
| `Squeak64-trunk` | `Pharo64-alpha` | `GemStone64-3.5.x` | `Moose64-trunk` |
| `Squeak64-6.0` | `Pharo64-stable` | `GemStone64-3.4.x` | `Moose64-10` |
| `Squeak64-5.3` | `Pharo64-11` | `GemStone64-3.3.x` | `Moose64-9.0` |
| `Squeak64-5.2` | `Pharo64-10` | `GemStone64-3.2.x` | `Moose64-8.0` |
| `Squeak64-5.1` | `Pharo64-9.0` | `GemStone64-3.1.0.x` | `Moose64-7.0` |
| `Squeak32-trunk` | `Pharo64-8.0` | `Gemstone64-2.4.x` | `Moose32-trunk` |
| `Squeak32-6.0` | `Pharo64-7.0` | | `Moose32-6.1` |
| `Squeak32-5.3` | `Pharo64-6.1` | | `Moose32-6.0` |
| `Squeak32-5.2` | `Pharo32-6.0` | | |
| `Squeak32-5.1` | `Pharo32-alpha` | | |
| `Squeak32-5.0` | `Pharo32-stable` | | |
| `Squeak32-4.6` | `Pharo32-11` | | |
| `Squeak32-4.5` | `Pharo32-10` | | |
| | `Pharo32-9.0` | | |
| | `Pharo32-8.0` | | |
| | `Pharo32-7.0` | | |
| | `Pharo32-6.1` | | |
| | `Pharo32-6.0` | | |
| | `Pharo32-5.0` | | |
| | `Pharo32-4.0` | | |
| | `Pharo32-3.0` | | |
| | | | |
| [Squeak][squeak] | [Pharo][pharo] | [GemStone][gemstone] | [Moose][moose] | [GToolkit][gtoolkit] |
| ---------------- | ---------------- | -------------------- | --------------- | -------------------- |
| `Squeak64-trunk` | `Pharo64-alpha` | `GemStone64-3.6.x` | `Moose64-trunk` | `GToolkit64-release` |
| `Squeak64-6.0` | `Pharo64-stable` | `GemStone64-3.5.8` | `Moose64-11` | |
| `Squeak64-5.3` | `Pharo64-12` | `GemStone64-3.5.7` | `Moose64-10` | |
| `Squeak64-5.2` | `Pharo64-11` | `GemStone64-3.5.6` | `Moose64-9.0` | |
| `Squeak64-5.1` | `Pharo64-10` | `GemStone64-3.5.5` | `Moose64-8.0` | |
| `Squeak32-trunk` | `Pharo64-9.0` | `Gemstone64-3.5.4` | `Moose64-7.0` | |
| `Squeak32-6.0` | `Pharo64-8.0` | `GemStone64-3.5.3` | `Moose32-trunk` | |
| `Squeak32-5.3` | `Pharo64-7.0` | | `Moose32-6.1` | |
| `Squeak32-5.2` | `Pharo64-6.1` | | `Moose32-6.0` | |
| `Squeak32-5.1` | `Pharo64-6.0` | | | |
| `Squeak32-5.0` | `Pharo32-alpha` | | | |
| `Squeak32-4.6` | `Pharo32-stable` | | | |
| `Squeak32-4.5` | `Pharo32-12` | | | |
| | `Pharo32-11` | | | |
| | `Pharo32-10` | | | |
| | `Pharo32-9.0` | | | |
| | `Pharo32-8.0` | | | |
| | `Pharo32-7.0` | | | |
| | `Pharo32-6.1` | | | |
| | `Pharo32-6.0` | | | |
| | `Pharo32-5.0` | | | |
| | `Pharo32-4.0` | | | |
| | `Pharo32-3.0` | | | |


## Templates
Expand Down Expand Up @@ -178,9 +179,9 @@ smalltalk:
- Pharo32-stable
- Pharo32-6.1
# ...
- GemStone64-3.3.2
- GemStone64-3.2.12
- GemStone64-3.1.0.6
- GemStone64-3.5.3
- GemStone64-3.6.0
- GemStone64-3.6.5
# ...

# Override `script` to customize smalltalkCI invocation, e.g.:
Expand Down Expand Up @@ -409,7 +410,7 @@ Otherwise, it will be loaded from the specified `#repository`.
SCIMetacelloLoadSpec {
#baseline : 'MyProject', // Define MC Baseline
#configuration : 'MyProject', // Alternatively, define MC Configuration
#directory : 'packages', // Path to packages if FileTree is used
#directory : 'src', // Path to source-code directory were are packages (i.e. 'packages' or 'src'), in case of packages are not on root
#failOn : [ #OCUndeclaredVariableWarning ], // Fail build on provided list of Warnings
#ignoreImage : true, // If true, Metacello will force a load of a package, overriding a previously existing one
#load : [ 'default' ], // Define MC load attributes
Expand Down Expand Up @@ -648,15 +649,28 @@ problem.
[animations](https://github.com/hpi-swa/animations),
[Ohm-S](https://github.com/hpi-swa/Ohm-S),
[signals](https://github.com/hpi-swa/signals),
[Sandblocks](https://github.com/hpi-swa/sandblocks),
[Squot](https://github.com/hpi-swa/Squot),
[vivide](https://github.com/hpi-swa/vivide),
[widgets](https://github.com/hpi-swa/widgets).
- [@hpi-swa-lab](https://github.com/hpi-swa-lab):
[Babylonian Programming/Smalltalk](https://github.com/hpi-swa-lab/babylonian-programming-smalltalk),
[Squeak by Example](https://github.com/hpi-swa-lab/SqueakByExample-english),
[Squeak Inbox Talk](https://github.com/hpi-swa-lab/squeak-inbox-talk).
- [@HPI-SWA-Teaching](https://github.com/HPI-SWA-Teaching):
[Algernon-Launcher](https://github.com/HPI-SWA-Teaching/Algernon-Launcher),
[AutoTDD](https://github.com/hpi-swa-teaching/AutoTDD),
[Koans](https://github.com/hpi-swa-teaching/Koans),
[Morphic Testing Framework](https://github.com/hpi-swa-teaching/Morphic-Testing-Framework),
[Poppy Print](https://github.com/hpi-swa-teaching/poppy-print),
[SpreadSheetTool](https://github.com/hpi-swa-teaching/SpreadSheetTool),
[TelegramClient](https://github.com/hpi-swa-teaching/TelegramClient),
[SwaLint](https://github.com/hpi-swa-teaching/SwaLint).
- [@LinqLover](https://github.com/LinqLover):
[create-image](https://github.com/LinqLover/create-image),
[SimulationStudio](https://github.com/LinqLover/SimulationStudio),
[TelegramBot](https://github.com/LinqLover/TelegramBot),
[XmasDecorations](https://github.com/LinqLover/XmasDecorations).
- [@marianopeck](https://github.com/marianopeck):
[OSSubprocess](https://github.com/marianopeck/OSSubprocess),
[FFICHeaderExtractor](https://github.com/marianopeck/FFICHeaderExtractor).
Expand Down Expand Up @@ -739,6 +753,7 @@ list. Please add [`[ci skip]`][ci_skip] to your commit message.*
[gitlab_ci_cd]: https://about.gitlab.com/features/gitlab-ci-cd/
[gofer]: http://www.lukas-renggli.ch/blog/gofer
[gs]: https://github.com/hpi-swa/smalltalkCI/issues/28
[gtoolkit]: https://gtoolkit.com
[issues]: https://github.com/hpi-swa/smalltalkCI/issues
[mc_baseline]: https://github.com/dalehenrich/metacello-work/blob/master/docs/GettingStartedWithGitHub.md#create-baseline
[mc_configuration]: https://github.com/dalehenrich/metacello-work/blob/master/docs/GettingStartedWithGitHub.md#create-configuration
Expand Down
16 changes: 16 additions & 0 deletions gemstone/doc.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
cp $GEMSTONE/bin/extent0.seaside.dbf extent0.dbf; chmod +w extent0.dbf

cp extent0_step_2.dbf extent0.dbf.
cp extent0_step_3.dbf extent0.dbf.
cp extent0_step_4.dbf extent0.dbf.

cp extent0_step_1.dbf extent0.dbf.
rm -rf tranlog*.*

startstone -e system.conf -z system.conf -l logs/smalltalkci.log smalltalkci
loadTode.stone -D

startnetldi -g -a dhenrich smalltalkci_ldi -P 36083 -l logs/netldi.log

stopstone smalltalkci DataCurator swordfish

Loading

0 comments on commit 7039fea

Please sign in to comment.