From 1f05f14d8b39497cb492b7b2876b85be2265964b Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Tue, 29 Jul 2025 16:41:07 +0200 Subject: [PATCH 1/2] add p13 ci and update readme file --- .github/workflows/{Pharo11CI.yml => CI.yml} | 61 +++++++++++--------- .github/workflows/Pharo12CI.yml | 28 --------- .smalltalk.ston => .smalltalkci.default.ston | 0 README.md | 9 ++- 4 files changed, 39 insertions(+), 59 deletions(-) rename .github/workflows/{Pharo11CI.yml => CI.yml} (55%) delete mode 100644 .github/workflows/Pharo12CI.yml rename .smalltalk.ston => .smalltalkci.default.ston (100%) diff --git a/.github/workflows/Pharo11CI.yml b/.github/workflows/CI.yml similarity index 55% rename from .github/workflows/Pharo11CI.yml rename to .github/workflows/CI.yml index 2a59ed4..c0b6932 100644 --- a/.github/workflows/Pharo11CI.yml +++ b/.github/workflows/CI.yml @@ -1,28 +1,33 @@ -name: 'Pharo 11 CI' - -on: - push: - branches: - - 'main' - pull_request: - types: [assigned, opened, synchronize, reopened] - -jobs: - build: - strategy: - matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - smalltalk: [ Pharo64-11 ] - runs-on: ${{ matrix.os }} - name: ${{ matrix.smalltalk }} on ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - uses: hpi-swa/setup-smalltalkCI@v1 - with: - smalltalk-image: ${{ matrix.smalltalk }} - - name: Load in New Image and Run Tests - run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} - shell: bash - timeout-minutes: 10 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +name: 'CI' + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +on: + push: + branches: + - 'main' + pull_request: + types: [assigned, opened, synchronize, reopened] + +jobs: + test: + strategy: + matrix: + os: [ ubuntu-latest, macos-latest, windows-latest ] + smalltalk: [ Pharo64-11, Pharo64-12, Pharo64-13 ] + ston: [ .smalltalkci.default.ston ] + runs-on: ${{ matrix.os }} + name: > + ${{ matrix.smalltalk }} • ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + + - uses: hpi-swa/setup-smalltalkCI@v1 + with: + smalltalk-image: ${{ matrix.smalltalk }} + + - name: Run ${{ matrix.ston == '.smalltalkci.default.ston' && 'Full' || 'Core' }} tests + run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} + shell: bash + timeout-minutes: 30 \ No newline at end of file diff --git a/.github/workflows/Pharo12CI.yml b/.github/workflows/Pharo12CI.yml deleted file mode 100644 index 41d224c..0000000 --- a/.github/workflows/Pharo12CI.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: 'Pharo 12 CI' - -on: - push: - branches: - - 'main' - pull_request: - types: [assigned, opened, synchronize, reopened] - -jobs: - build: - strategy: - matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - smalltalk: [ Pharo64-12 ] - runs-on: ${{ matrix.os }} - name: ${{ matrix.smalltalk }} on ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - uses: hpi-swa/setup-smalltalkCI@v1 - with: - smalltalk-image: ${{ matrix.smalltalk }} - - name: Load in New Image and Run Tests - run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} - shell: bash - timeout-minutes: 10 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.smalltalk.ston b/.smalltalkci.default.ston similarity index 100% rename from .smalltalk.ston rename to .smalltalkci.default.ston diff --git a/README.md b/README.md index 2594a41..79dae38 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ -[![License](https://img.shields.io/github/license/openSmock/Bloc-Serialization.svg)](./LICENSE) -[![Pharo 11 CI](https://github.com/OpenSmock/Bloc-Serialization/actions/workflows/Pharo11CI.yml/badge.svg)](https://github.com/OpenSmock/Bloc-Serialization/actions/workflows/Pharo11CI.yml) -[![Pharo 12 CI](https://github.com/OpenSmock/Bloc-Serialization/actions/workflows/Pharo12CI.yml/badge.svg)](https://github.com/OpenSmock/Bloc-Serialization/actions/workflows/Pharo12CI.yml) +[![Pharo 11](https://img.shields.io/badge/Pharo-11-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 12](https://img.shields.io/badge/Pharo-12-%23aac9ff.svg)](https://pharo.org/download) +[![Pharo 13](https://img.shields.io/badge/Pharo-13-%23aac9ff.svg)](https://pharo.org/download) + +[![License](https://img.shields.io/github/license/OpenSmock/Bloc-Serialization.svg)](./LICENSE) +[![Unit tests](https://github.com/OpenSmock/Bloc-Serialization/actions/workflows/CI.yml/badge.svg)](https://github.com/OpenSmock/Bloc-Serialization/actions/workflows/CI.yml) # Bloc-Serialization From 335dbf399ab672af2d61e2acaaf6eaa6b16a010e Mon Sep 17 00:00:00 2001 From: Pierre Laborde <49183340+labordep@users.noreply.github.com> Date: Tue, 29 Jul 2025 18:09:36 +0200 Subject: [PATCH 2/2] remove not used code --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c0b6932..1f0006b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: with: smalltalk-image: ${{ matrix.smalltalk }} - - name: Run ${{ matrix.ston == '.smalltalkci.default.ston' && 'Full' || 'Core' }} tests + - name: Run ${{ matrix.ston == '.smalltalkci.default.ston' }} tests run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} shell: bash timeout-minutes: 30 \ No newline at end of file