From 177bf75af57f4a991f8147712a635094d7ba02a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ortiz=20Pe=C3=B1aloza?= <90245+fortizpenaloza@users.noreply.github.com> Date: Fri, 18 Aug 2023 23:42:39 -0300 Subject: [PATCH 1/3] Update loading-groups.yml Drop support for older Pharo versions --- .github/workflows/loading-groups.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml index 0373b61..98e6e79 100644 --- a/.github/workflows/loading-groups.yml +++ b/.github/workflows/loading-groups.yml @@ -1,4 +1,4 @@ -name: Group Loading +name: Baseline groups on: [ push, pull_request, workflow_dispatch ] @@ -8,11 +8,11 @@ jobs: strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-9.0 ] - load-spec: [ deployment, development] + smalltalk: [ Pharo64-11, Pharo64-10 ] + load-spec: [ deployment, tests, tools, development] name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} @@ -20,4 +20,4 @@ jobs: run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalkci/.loading.${{ matrix.load-spec }}.ston env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - timeout-minutes: 15 \ No newline at end of file + timeout-minutes: 15 From e82450d5a558a071bf64770fcc9482a28300a296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ortiz=20Pe=C3=B1aloza?= <90245+fortizpenaloza@users.noreply.github.com> Date: Fri, 18 Aug 2023 23:59:30 -0300 Subject: [PATCH 2/3] Refactor github actions files --- .github/workflows/loading-groups.yml | 2 -- .github/workflows/markdown-lint.yml | 8 +++----- .github/workflows/shellcheck.yml | 4 +--- .github/workflows/unit-tests.yml | 13 ++++++------- .smalltalkci/.loading.development.ston | 5 ++++- .smalltalkci/.loading.tests.ston | 16 ++++++++++++++++ .smalltalkci/.loading.tools.ston | 13 +++++++++++++ 7 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 .smalltalkci/.loading.tests.ston create mode 100644 .smalltalkci/.loading.tools.ston diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml index 98e6e79..b454460 100644 --- a/.github/workflows/loading-groups.yml +++ b/.github/workflows/loading-groups.yml @@ -1,7 +1,5 @@ name: Baseline groups - on: [ push, pull_request, workflow_dispatch ] - jobs: group-loading: runs-on: ubuntu-latest diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml index 7156693..3dc7e9c 100644 --- a/.github/workflows/markdown-lint.yml +++ b/.github/workflows/markdown-lint.yml @@ -1,15 +1,13 @@ name: Markdown Lint - on: [ push, pull_request, workflow_dispatch ] - jobs: remark-lint: - name: markdownlint + name: runner / markdownlint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: markdownlint - uses: reviewdog/action-markdownlint@v0.1 + uses: reviewdog/action-markdownlint@v0 with: github_token: ${{ secrets.GITHUB_TOKEN }} fail_on_error: true diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 9bef968..9321c9f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -1,12 +1,10 @@ name: Shellcheck - on: [ push, pull_request ] - jobs: shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run Shellcheck uses: reviewdog/action-shellcheck@v1 with: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 2f5e256..13d20c6 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -1,16 +1,14 @@ -name: Unit Tests - +name: Pharo Unit Tests on: [ push, pull_request, workflow_dispatch ] - jobs: build: runs-on: ubuntu-latest strategy: matrix: - smalltalk: [ Pharo64-9.0 ] + smalltalk: [ Pharo64-11, Pharo64-10 ] name: ${{ matrix.smalltalk }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} @@ -20,7 +18,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} timeout-minutes: 15 - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: - name: ${{ matrix.os }}-${{ matrix.smalltalk }} + name: Unit-Tests-${{ matrix.smalltalk }} token: ${{ secrets.CODECOV_TOKEN }} + flags: unit diff --git a/.smalltalkci/.loading.development.ston b/.smalltalkci/.loading.development.ston index 72256d8..f84a725 100644 --- a/.smalltalkci/.loading.development.ston +++ b/.smalltalkci/.loading.development.ston @@ -8,6 +8,9 @@ SmalltalkCISpec { } ], #testing : { - #failOnZeroTests : false + #coverage : { + #packages : ['Cosmos*' ], + #format: lcov + } } } \ No newline at end of file diff --git a/.smalltalkci/.loading.tests.ston b/.smalltalkci/.loading.tests.ston new file mode 100644 index 0000000..3ea0e0f --- /dev/null +++ b/.smalltalkci/.loading.tests.ston @@ -0,0 +1,16 @@ +SmalltalkCISpec { + #loading : [ + SCIMetacelloLoadSpec { + #baseline : 'Cosmos', + #directory : '../source', + #load : [ 'Tests' ], + #platforms : [ #pharo ] + } + ], + #testing : { + #coverage : { + #packages : ['Cosmos*' ], + #format: lcov + } + } +} \ No newline at end of file diff --git a/.smalltalkci/.loading.tools.ston b/.smalltalkci/.loading.tools.ston new file mode 100644 index 0000000..2ebf5e7 --- /dev/null +++ b/.smalltalkci/.loading.tools.ston @@ -0,0 +1,13 @@ +SmalltalkCISpec { + #loading : [ + SCIMetacelloLoadSpec { + #baseline : 'Cosmos', + #directory : '../source', + #load : [ 'Tools' ], + #platforms : [ #pharo ] + } + ], + #testing : { + #failOnZeroTests : false + } +} \ No newline at end of file From 7bfca727eceb4959a2373aebbbda437c250f589a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ortiz=20Pe=C3=B1aloza?= <90245+fortizpenaloza@users.noreply.github.com> Date: Sat, 19 Aug 2023 00:10:05 -0300 Subject: [PATCH 3/3] Add missing # --- .smalltalkci/.loading.development.ston | 4 ++-- .smalltalkci/.loading.tests.ston | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.smalltalkci/.loading.development.ston b/.smalltalkci/.loading.development.ston index f84a725..b68dbaa 100644 --- a/.smalltalkci/.loading.development.ston +++ b/.smalltalkci/.loading.development.ston @@ -9,8 +9,8 @@ SmalltalkCISpec { ], #testing : { #coverage : { - #packages : ['Cosmos*' ], - #format: lcov + #packages : [ 'Cosmos*' ], + #format: #lcov } } } \ No newline at end of file diff --git a/.smalltalkci/.loading.tests.ston b/.smalltalkci/.loading.tests.ston index 3ea0e0f..066e261 100644 --- a/.smalltalkci/.loading.tests.ston +++ b/.smalltalkci/.loading.tests.ston @@ -9,8 +9,8 @@ SmalltalkCISpec { ], #testing : { #coverage : { - #packages : ['Cosmos*' ], - #format: lcov + #packages : [ 'Cosmos*' ], + #format: #lcov } } } \ No newline at end of file