diff --git a/.filetree b/.filetree deleted file mode 100644 index 859128c..0000000 --- a/.filetree +++ /dev/null @@ -1,3 +0,0 @@ -{"packageExtension" : ".package", -"propertyFileExtension" : ".json", -"Metadata" : "false" } \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91bd9ff..a73e5aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,21 +1,21 @@ name: CI -on: [push, pull_request] +on: [ push, pull_request ] jobs: build: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} strategy: matrix: - # Select platform(s) - os: [ ubuntu-latest, macos-latest, windows-latest ] - # Select compatible Smalltalk image(s) - smalltalk: [ Pharo64-8.0 ] - name: ${{ matrix.smalltalk }} on ${{ matrix.os }} + smalltalk: [ Pharo64-8.0, Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12, Pharo64-13 ] + name: ${{ matrix.smalltalk }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: hpi-swa/setup-smalltalkCI@v1 with: - smalltalk-version: ${{ matrix.smalltalk }} + smalltalk-image: ${{ matrix.smalltalk }} - run: smalltalkci -s ${{ matrix.smalltalk }} - timeout-minutes: 15 + shell: bash + timeout-minutes: 15 \ No newline at end of file diff --git a/.smalltalk.ston b/.smalltalk.ston index b30166c..0d3871e 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -2,8 +2,7 @@ SmalltalkCISpec { #loading : [ SCIMetacelloLoadSpec { #baseline : 'Diameter', - #directory : 'mc', - #platforms : [ #pharo ] + #directory : 'mc' } ] } diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 30a956b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: smalltalk -sudo: required - -os: -- linux - -smalltalk: -- Pharo-6.0 -- Pharo-7.0 diff --git a/README.md b/README.md index 34463a1..12fd260 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,30 @@ RFC 6733 (diameter base) parser and toolkit Parse Diameter AVP groups and messages and convert them to a model. The model can be used to generate efficient C/C++ codec code and a highly flexible Smalltalk toolkit. + +## Installation + +To install diameter on your Pharo image, execute the following script: + +```Smalltalk +Metacello new + githubUser: 'moiji-mobile' project: 'diameter' commitish: 'master' path: 'mc'; + baseline: 'Diameter'; + load +``` + +To add diameter to your baseline: + +```Smalltalk +spec + baseline: 'Diameter' + with: [ spec repository: 'github://moiji-mobile/diameter:master/mc' ] +``` + +Note you can replace the #master by another branch such as #development or a tag such as #v1. + +## Smalltalk versions compatibility + +| Version | Compatible Pharo versions | +|------------- |------------------------------| +| master | Pharo 80, 90, 10, 11, 12, 13 | \ No newline at end of file diff --git a/ci_wercker.sh b/ci_wercker.sh deleted file mode 100755 index 4beb5c2..0000000 --- a/ci_wercker.sh +++ /dev/null @@ -1,51 +0,0 @@ - -prepare_pharo60_vm() { - echo "Using Pharo60+ VM" - - VM=pharo-linux-latest.zip - wget -c http://files.pharo.org/get-files/70/$VM - wget -c http://files.pharo.org/get-files/60/sources.zip - - rm -rf vm/ - mkdir -p vm/ - unzip -d vm/ $VM - - # And place the right Pharo6 sources into the VM directory. - unzip -d vm/lib/pharo/*/ sources.zip - - # Pharo and --nodisplay - PHAROVM=$PWD/vm/pharo - PHAROARG="--nodisplay" - PHAROTEST="--pharo-arg=$PHAROARG" -} - -prepare_pharo60_img() { - echo "Going to fetch latest Pharo60 image" - VER=60539 - wget -c http://files.pharo.org/image/60/$VER.zip - SUM=`sha256sum $VER.zip | cut -d ' ' -f 1` - echo $SUM - if [ "$SUM" != "1562578b14df41c031e5d79218aff00db07d8817786e9f493614a0297b6ee90d" ]; then - echo "Smalltalk image has changed and should not have changed: $SUM" - exit 23 - fi - unzip $VER.zip - mv Pharo*.image Diameter.image - mv Pharo*.changes Diameter.changes -} - -function ci_test() { - $PHAROVM $PHAROARG Diameter.image eval --save "Metacello new \ - baseline: 'Diameter'; \ - repository: 'filetree://$SRCDIR/mc/'; load." - $PHAROVM $PHAROARG RoamingHub.image test --junit-xml-output "Diameter" -} - -# Change directory -SRCDIR=$1 -cd $SRCDIR -mkdir -p build -cd build - -prepare_pharo60_vm -ci_test diff --git a/wercker.yml b/wercker.yml deleted file mode 100644 index 7e09822..0000000 --- a/wercker.yml +++ /dev/null @@ -1,10 +0,0 @@ -build: - box: - id: moijidev/debianbase - username: $USERNAME - password: $PASSWORD - steps: - - script: - name: Build image - code: | - ./ci_wercker.sh $PWD