Skip to content

Commit

Permalink
Merge pull request #256 from hpi-swa-teaching/bugfix/ci
Browse files Browse the repository at this point in the history
Fix for basic CI/CD pipeline
  • Loading branch information
vlindow authored Jun 9, 2024
2 parents a54a5ec + 7c33154 commit 8dcac17
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 61 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI-Legacy
name: CI

on: [push, pull_request]

Expand All @@ -8,16 +8,16 @@ jobs:
strategy:
matrix:
# Select platform(s)
os: [ ubuntu-latest, macos-latest ]
os: [ ubuntu-latest ]
# Select compatible Smalltalk image(s)
smalltalk: [ Squeak64-5.3, Squeak64-5.2 ]
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
smalltalk: [ Squeak64-6.0 ]
name: Linting
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.legacy.ston
- run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.lint.ston
timeout-minutes: 15
env:
# for uploading coverage reports
Expand Down
20 changes: 0 additions & 20 deletions .github/workflows/ci-linter.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
strategy:
matrix:
# Select platform(s)
os: [ ubuntu-latest, macos-latest ]
os: [ ubuntu-latest ]
# Select compatible Smalltalk image(s)
smalltalk: [ Squeak64-5.3 ]
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
smalltalk: [ Squeak64-6.0 ]
name: Testing ${{ matrix.smalltalk }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }}
- run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.ston
timeout-minutes: 15
env:
# for uploading coverage reports
Expand Down
4 changes: 2 additions & 2 deletions .smalltalk.ston
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ SmalltalkCISpec {
],
#testing : {
#coverage : {
#packages : [ 'Liquid-Core','Liquid-Network','Liquid-UI']
#packages : [ #Liquid-Core, #Liquid-Network, #Liquid-UI ]
},
#exclude : {
#classes : [ #LQLintTests ]
#classes : [ #LQLintTests, #LQVisualizationTests, #LQToolbuilderTests, #LQStatisticsWorkbenchIntegrationTests ]
}
}
}
2 changes: 2 additions & 0 deletions packages/.filetree
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{"propertyFileExtension" : ".json",
"packageExtension" : ".package" }
5 changes: 0 additions & 5 deletions packages/BaselineOfLiquid.package/.squot-contents

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
baseline
baseline: spec
<baseline>

spec
for: #common do: [
spec
baseline: 'StatisticsWorkbench'
with: [spec repository: 'github://hpi-swa-teaching/StatisticsWorkbench:11245259c9fa9e0be1254a79ee744f28e56894d8/packages'];
baseline: 'SwaLint'
with: [spec repository: 'github://hpi-swa-teaching/SwaLint:release/packages'];
package: 'Liquid-Core' with: [spec requires: #('libraries')];
package: 'Liquid-Network' with: [spec requires: #('libraries')];
package: 'Liquid-UI' with: [spec requires: #('libraries')];
package: 'Liquid-Tests' with: [spec requires: #('SwaLint' 'default')];
yourself.
spec
group: 'libraries' with: #('StatisticsWorkbench');
group: 'default' with: #('Liquid-Core' 'Liquid-Network' 'Liquid-UI');
group: 'tests' with: #('Liquid-Tests')];
yourself
<baseline>
spec
for: #'common'
do: [
spec
baseline: 'SwaLint'
with: [spec repository: 'github://hpi-swa-teaching/SwaLint:release/packages'];
package: 'Liquid-Core';
package: 'Liquid-Network';
package: 'Liquid-UI';
package: 'Liquid-Tests' with: [spec requires: #('SwaLint' 'default')];
yourself.
spec
group: 'default' with: #('Liquid-Core' 'Liquid-Network' 'Liquid-UI');
group: 'tests' with: #('Liquid-Tests');
yourself].
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"class" : {
},
"instance" : {
"baseline:" : "CG 7/30/2021 19:06" } }
"baseline:" : "FLST 6/7/2024 12:09" } }
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
bugs
testNoMessagesSentButNotImplemented

self assertAllZero: (self lint: #smallLintSentNotImplemented except: {LQAuthenticationTests})
self
assertAllZero: (self lint: #smallLintSentNotImplemented except: {LQAuthenticationTests. LQVisualizationView})
"Note: The test for LQVisualizationView does not properly work as SwaLint can't locate the StatisticsWorkbench"
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"testNoInstanceVariableNotReadAndWritten" : "psi 5/26/2021 20:55",
"testNoLiteralArrayContainsComma" : "psi 5/26/2021 20:55",
"testNoLiteralArrayContainsSuspiciousTrueFalseOrNil" : "psi 5/26/2021 20:56",
"testNoMessagesSentButNotImplemented" : "kge 6/25/2022 21:26",
"testNoMessagesSentButNotImplemented" : "FLST 6/7/2024 14:32",
"testNoMethodEquivalentDefinedInSuperclass" : "CG 7/30/2021 19:06",
"testNoMethodHasNoTimestamp" : "psi 5/26/2021 20:56",
"testNoMethodJustSendsSuperMessage" : "CG 7/30/2021 19:06",
Expand Down

0 comments on commit 8dcac17

Please sign in to comment.