From a8ab44f74f93845b95cb02e105d95fbed9169b8b Mon Sep 17 00:00:00 2001 From: Sean DeNigris Date: Wed, 28 Aug 2024 17:20:52 -0400 Subject: [PATCH] [CI]: Update to Latest PharoEnhancements Workflow Including smalltalk STON file update --- .github/workflows/runTests.yaml | 38 ++++++--------------------------- .smalltalk.ston | 8 ++++--- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/.github/workflows/runTests.yaml b/.github/workflows/runTests.yaml index 76ef674..da1a34f 100644 --- a/.github/workflows/runTests.yaml +++ b/.github/workflows/runTests.yaml @@ -1,6 +1,4 @@ -## Adapted from: -## - Roassal3 - https://github.com/ObjectProfile/Roassal3/blob/36b92db2055501c87f2ccea5573fc83fb4916884/.github/workflows/runTests.yml -## - Willow-Playground - https://github.com/ba-st/Willow-Playground/blob/2898e1afbdd5a6011721e5a640225f81ae895de2/.github/workflows/build.yml0 +# Adapted from https://github.com/seandenigris/Pharo-Enhancements/blob/master/.github/workflows/ci.yaml name: CI @@ -15,33 +13,9 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel +# Adapted from https://docs.github.com/en/actions/using-workflows/reusing-workflows jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - strategy: - matrix: - smalltalk: [ GToolkit64-release, Pharo64-10 ] - name: ${{ matrix.smalltalk }} - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - - uses: hpi-swa/setup-smalltalkCI@v1 - with: - smalltalk-image: ${{ matrix.smalltalk }} - - name: Load Image and Run Tests - run: smalltalkci -s ${{ matrix.smalltalk }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - timeout-minutes: 15 -# - name: Upload coverage to Codecov -# uses: codecov/codecov-action@v1 -# with: -# name: ${{matrix.os}}-${{matrix.smalltalk}} -# token: ${{ secrets.CODECOV_TOKEN }} + test-and-release: + uses: seandenigris/Pharo-Enhancements/.github/workflows/ci_reusable.yaml@master + with: + project-name: PharoWebBrowser \ No newline at end of file diff --git a/.smalltalk.ston b/.smalltalk.ston index fe1edbe..067b0ad 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -3,7 +3,9 @@ SmalltalkCISpec { SCIMetacelloLoadSpec { #baseline : 'ExternalWebBrowser', #directory : 'repository', - #platforms : [ #pharo ] + #onConflict : #useIncoming } - ] -} + ], + #testing : { + #failOnZeroTests : false } +} \ No newline at end of file