Merge pull request #5 from ba-st/update-to-willow-14

Update to willow 14
ba-st · Jan 20, 2021 · 4fb05b6 · 4fb05b6
2 parents 5941d2d + 3ef574e
commit 4fb05b6
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,18 +11,20 @@ jobs:
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v2
-      - uses: ba-st-actions/setup-smalltalkCI@v1.0.0
+      - uses: hpi-swa/setup-smalltalkCI@v1
         env:
           WA0_DOMAIN: example-tenant.auth0.com
           WA0_CLIENT_ID: example-id
           WA0_CLIENT_SECRET: example-secret
         with:
           smalltalk-version: ${{ matrix.smalltalk }}
-      - run: smalltalkci -s ${{ matrix.smalltalk }}
+      - name: Load Image and Run Tests
+        run: smalltalkci -s ${{ matrix.smalltalk }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         timeout-minutes: 15
-      - run: echo "::set-env name=SCI_COVERAGE_FILE_LOCATION::${HOME}/.smalltalkCI/_builds/coveralls_results.json"
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.0.6
+        uses: codecov/codecov-action@v1
         with:
+          name: ${{matrix.os}}-${{matrix.smalltalk}}
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ${{ env.SCI_COVERAGE_FILE_LOCATION }}
diff --git a/.github/workflows/loading-groups.yml b/.github/workflows/loading-groups.yml
@@ -0,0 +1,23 @@
+name: Group loading check
+
+on: [push,pull_request]
+
+jobs:
+   build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        smalltalk: [ Pharo64-8.0, Pharo64-7.0 ]
+        load-spec: [ deployment, dependent-sunit-extensions, tests, tools, development]
+    name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: hpi-swa/setup-smalltalkCI@v1
+        with:
+          smalltalk-version: ${{ matrix.smalltalk }}
+      - name: Load group in image
+        run: smalltalkci -s ${{ matrix.smalltalk }} .loading.${{ matrix.load-spec }}.ston
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        timeout-minutes: 15
diff --git a/.loading.dependent-sunit-extensions.ston b/.loading.dependent-sunit-extensions.ston
@@ -0,0 +1,13 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowAuth0',
+      #directory : 'source',
+      #load : [ 'Dependent-SUnit-Extensions' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #failOnZeroTests : false
+  }
+}
diff --git a/.loading.deployment.ston b/.loading.deployment.ston
@@ -0,0 +1,13 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowAuth0',
+      #directory : 'source',
+      #load : [ 'Deployment' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #failOnZeroTests : false
+  }
+}
diff --git a/.loading.development.ston b/.loading.development.ston
@@ -0,0 +1,16 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowAuth0',
+      #directory : 'source',
+      #load : [ 'Development' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #coverage : {
+      #packages : [ 'Willow-Auth0*' ],
+      #format: #lcov
+    }
+  }
+}
diff --git a/.loading.tests.ston b/.loading.tests.ston
@@ -0,0 +1,16 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowAuth0',
+      #directory : 'source',
+      #load : [ 'Tests' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #coverage : {
+      #packages : [ 'Willow-Auth0*' ],
+      #format: #lcov
+    }
+  }   
+}
diff --git a/.loading.tools.ston b/.loading.tools.ston
@@ -0,0 +1,13 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'WillowAuth0',
+      #directory : 'source',
+      #load : [ 'Tools' ],
+      #platforms : [  #pharo ]
+    }
+  ],
+  #testing : {
+    #failOnZeroTests : false
+  }
+}
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -9,7 +9,8 @@ SmalltalkCISpec {
   ],
   #testing : {
     #coverage : {
-       #packages : [ 'Willow-Auth0*' ]
+       #packages : [ 'Willow-Auth0*' ],
+      #format: #lcov
     }
   }
 }
diff --git a/source/BaselineOfWillowAuth0/BaselineOfWillowAuth0.class.st b/source/BaselineOfWillowAuth0/BaselineOfWillowAuth0.class.st
@@ -20,7 +20,7 @@ BaselineOfWillowAuth0 >> baseline: spec [
 				group: 'CI' with: 'Tests';
 				group: 'Dependent-SUnit-Extensions' with: 'Willow-SUnit';
 				group: 'Tools' with: 'Willow-Tools';
-				group: 'Development' with: #('Tests' 'Tools')
+				group: 'Development' with: #('Tests')
 			]
 ]
 
@@ -34,7 +34,7 @@ BaselineOfWillowAuth0 >> projectClass [
 BaselineOfWillowAuth0 >> setUpDependencies: spec [
 
 	spec
-		baseline: 'Willow' with: [ spec repository: 'github://ba-st/Willow:v13/source' ];
+		baseline: 'Willow' with: [ spec repository: 'github://ba-st/Willow:v14/source' ];
 		project: 'Willow-Deployment' copyFrom: 'Willow' with: [ spec loads: 'Deployment' ];
 		project: 'Willow-SUnit' copyFrom: 'Willow' with: [ spec loads: 'Dependent-SUnit-Extensions' ];
 		project: 'Willow-Tools' copyFrom: 'Willow' with: [ spec loads: 'Tools' ].
@@ -52,6 +52,6 @@ BaselineOfWillowAuth0 >> setUpPackages: spec [
 	spec
 		package: 'Willow-Auth0' with: [ spec requires: #('Willow-Deployment' 'JSONWebToken-Deployment') ];
 		group: 'Deployment' with: 'Willow-Auth0';
-		package: 'Willow-Auth0-Tests' with: [ spec requires: #('Willow-Auth0' 'Willow-SUnit') ];
+		package: 'Willow-Auth0-Tests' with: [ spec requires: #('Willow-Auth0' 'Willow-Tools' 'Willow-SUnit') ];
 		group: 'Tests' with: 'Willow-Auth0-Tests'
 ]