diff --git a/.github/workflows/test-moose.yml b/.github/workflows/test-moose.yml index 2f8efac..2e7ee53 100644 --- a/.github/workflows/test-moose.yml +++ b/.github/workflows/test-moose.yml @@ -3,28 +3,30 @@ name: CI Moose env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -on: - push: - branches: [ v6 ] - pull_request: - branches: [ v6 ] +on: [push, pull_request, workflow_dispatch] jobs: build: runs-on: ubuntu-latest strategy: matrix: - smalltalk: [ Moose64-12 ] + smalltalk: [ Moose64-12, Moose64-13 ] name: ${{ matrix.smalltalk }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} - run: smalltalkci -s ${{ matrix.smalltalk }} shell: bash timeout-minutes: 15 - - name: Coveralls - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} + + finish-coveralls: + needs: build + runs-on: ubuntu-latest + steps: + - name: Finish Coveralls + uses: coverallsapp/github-action@v2 + with: + github-token: ${{ secrets.github_token }} + parallel-finished: true diff --git a/.smalltalk.ston b/.smalltalk.ston index 19b8504..91d1152 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -1,5 +1,4 @@ SmalltalkCISpec { - #preLoading : 'ci/preLoading.st', #loading : [ SCIMetacelloLoadSpec { #baseline : 'Carrefour', diff --git a/README.md b/README.md index 3a31d69..950ed39 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Carrefour -[![Moose version](https://img.shields.io/badge/Moose-12-%23aac9ff.svg)](https://github.com/moosetechnology/Moose) +Supported Moose Versions: [![Moose version 12](https://img.shields.io/badge/Moose-12-%23aac9ff.svg)](https://github.com/moosetechnology/Moose) [![Moose version 13](https://img.shields.io/badge/Moose-13-%23aac9ff.svg)](https://github.com/moosetechnology/Moose) + [![CI](https://github.com/moosetechnology/Carrefour/actions/workflows/test-moose.yml/badge.svg?branch=v6)](https://github.com/moosetechnology/Carrefour/actions/workflows/test-moose.yml) + [![Coverage Status](https://coveralls.io/repos/github/moosetechnology/Carrefour/badge.svg?branch=v6)](https://coveralls.io/github/moosetechnology/Carrefour?branch=v6) Binding between Famix and FAST diff --git a/ci/preLoading.st b/ci/preLoading.st deleted file mode 100644 index f80be9d..0000000 --- a/ci/preLoading.st +++ /dev/null @@ -1 +0,0 @@ -Iceberg remoteTypeSelector: #httpsUrl. \ No newline at end of file diff --git a/src/BaselineOfCarrefour/BaselineOfCarrefour.class.st b/src/BaselineOfCarrefour/BaselineOfCarrefour.class.st index 01b3764..b2ab95f 100644 --- a/src/BaselineOfCarrefour/BaselineOfCarrefour.class.st +++ b/src/BaselineOfCarrefour/BaselineOfCarrefour.class.st @@ -33,7 +33,7 @@ BaselineOfCarrefour >> defineDependencies: spec [ spec baseline: 'FASTJava' with: [ spec loads: #( 'all' ); - repository: 'github://moosetechnology/FAST-JAVA:v3.0.9/src' ]. + repository: 'github://moosetechnology/FAST-JAVA:v4.0.0/src' ]. spec baseline: 'Famix2Java' with: [