Skip to content

Commit

Permalink
Merge pull request #103 from noha/add-pharo7-support
Browse files Browse the repository at this point in the history
add pharo7 support. Pharo7 is now building as good (bad!) as before. We need to fix unqlite still
  • Loading branch information
noha authored Aug 21, 2018
2 parents 22e41af + b462721 commit 00088b7
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 13 deletions.
12 changes: 12 additions & 0 deletions .smalltalk-legacy.ston
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
SmalltalkCISpec {
#loading : [
SCIMetacelloLoadSpec {
#baseline : 'Voyage',
#directory : 'mc',
#load : [ 'mongo tests' ],
#platforms : [ #pharo ],
#useLatestMetacello : true
}
]
}

3 changes: 1 addition & 2 deletions .smalltalk.ston
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ SmalltalkCISpec {
#baseline : 'Voyage',
#directory : 'mc',
#load : [ 'mongo tests' ],
#platforms : [ #pharo ],
#useLatestMetacello : true
#platforms : [ #pharo ]
}
]
}
Expand Down
17 changes: 13 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,29 @@ os:
# - osx
install:
- pip install --user benchupload

services:
- mongodb
smalltalk:
- Pharo-6.0
- Pharo-5.0
smalltalk_config: .smalltalk.ston

matrix:
include:
- smalltalk: Pharo-7.0
smalltalk_config: .smalltalk.ston
- smalltalk: Pharo-6.0
smalltalk_config: .smalltalk-legacy.ston
- smalltalk: Pharo-5.0
smalltalk_config: .smalltalk-legacy.ston
- smalltalk: Pharo-7.0
before_script: wget https://github.com/pharo-nosql/PunQLite/releases/download/stable/unqlite.so
smalltalk_config: .smalltalk-unqlite.ston
- smalltalk: Pharo-6.0
before_script: wget https://github.com/pharo-nosql/PunQLite/releases/download/stable/unqlite.so
smalltalk_config: .smalltalk-unqlite.ston
- smalltalk: Pharo-5.0
before_script: wget https://github.com/pharo-nosql/PunQLite/releases/download/stable/unqlite.so
smalltalk_config: .smalltalk-unqlite.ston
- smalltalk: Pharo-7.0
smalltalk_config: .smalltalk-multiple.ston
- smalltalk: Pharo-6.0
smalltalk_config: .smalltalk-multiple.ston
- smalltalk: Pharo-5.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ external projects
magritte: spec
spec
baseline: 'Magritte'
with: [ spec repository: 'github://magritte-metamodel/magritte:v3.5.2/source';
with: [ spec repository: 'github://magritte-metamodel/magritte:v3.5.3/source';
loads: #( 'Core' ) ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ external projects
mongoTalk: spec
spec
baseline: 'MongoTalk'
with: [ spec repository: 'github://pharo-nosql/mongotalk:1.14/mc' ];
with: [ spec repository: 'github://pharo-nosql/mongotalk:1.15/mc' ];
import: 'MongoTalk'
6 changes: 4 additions & 2 deletions mc/Voyage-JSON.package/TVOManyRelation.trait/properties.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"name" : "TVOManyRelation",
"commentStamp" : "TorstenBergmann 3/4/2015 20:39",
"category" : "Voyage-JSON-Magritte"
"classinstvars" : [ ],
"category" : "Voyage-JSON-Magritte",
"instvars" : [ ],
"name" : "TVOManyRelation"
}
6 changes: 4 additions & 2 deletions mc/Voyage-JSON.package/TVOPostLoad.trait/properties.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"name" : "TVOPostLoad",
"commentStamp" : "TorstenBergmann 3/4/2015 20:39",
"category" : "Voyage-JSON-Magritte"
"classinstvars" : [ ],
"category" : "Voyage-JSON-Magritte",
"instvars" : [ ],
"name" : "TVOPostLoad"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ removeDuplicated: aCollection
inject: Dictionary new
into: [ :all :each |
all
at: each selector put: each;
at: each method selector put: each;
yourself ])
values
asSet
Expand Down

0 comments on commit 00088b7

Please sign in to comment.