Merge pull request SeasideSt#155 from SeasideSt/pharo11

Johan Brichau · web-flow · commit 92748db9a7bd · 2023-01-21T16:24:37.000+01:00
Add pharo 11 to baseline (also cleanup code critics on baseline)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,37 +18,12 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     name: ${{ matrix.smalltalk }}
     steps:
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%S')"
-      - name: Log date
-        run: echo "${{ steps.date.outputs.date }}"
-      - name: Set default run status
-        run: echo "::set-output name=last_run_status::default" > last_run_status
-      - name: Restore last run status
-        id: last_run
-        uses: actions/cache@v2
-        with:
-          path: |
-            last_run_status
-          key: ${{ github.run_id }}-${{ matrix.smalltalk }}-${{ steps.date.outputs.date }}
-          restore-keys: |
-            ${{ github.run_id }}-${{ matrix.smalltalk }}-
-      - name: Set last run status
-        id: last_run_status
-        run: cat last_run_status
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.workflow_dispatch.ref }}
+      - uses: actions/checkout@v3
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
       - name: Run tests
         id: test_run
-        if: steps.last_run_status.outputs.last_run_status != 'success'
         run: smalltalkci -s ${{ matrix.smalltalk }}
         shell: bash
-        timeout-minutes: 20
-      - name: Save run status
-        if: steps.last_run_status.outputs.last_run_status != 'success'
-        run: echo "::set-output name=last_run_status::${{ steps.test_run.outcome }}" > last_run_status
+        timeout-minutes: 20
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
@@ -1,6 +1,6 @@
 baselines
 baselinePharo: spec
-			
+
 	spec
 		for: #'pharo6.x'
 		do: [ spec
@@ -25,7 +25,7 @@ baselinePharo: spec
 
 	spec
 		for: #(#'pharo6.x' #'pharo7.x' #'pharo8.x')
-		do: [ 
+		do: [
 			spec
 				package: 'Grease-Pharo40-Slime' with: [ spec requires: #('Grease-Core') ];
 				package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo40-Slime') ].
@@ -35,7 +35,7 @@ baselinePharo: spec
 
 	spec
 		for: #(#'pharo9.x')
-		do: [ 
+		do: [
 			spec
 				package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
 				package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
@@ -50,10 +50,10 @@ baselinePharo: spec
 			spec
 				group: 'Slime' with: #('Grease-Pharo90-Slime');
 				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
-				
+
 	spec
-		for: #(#'pharo10.x')
-		do: [ 
+		for: #(#'pharo10.x' #'pharo11.x')
+		do: [
 			spec
 				package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];
 				package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
@@ -67,4 +67,4 @@ baselinePharo: spec
 
 			spec
 				group: 'Slime' with: #('Grease-Pharo90-Slime');
-				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
diff --git a/repository/BaselineOfGrease.package/monticello.meta/categories.st b/repository/BaselineOfGrease.package/monticello.meta/categories.st
@@ -1 +1,2 @@
 SystemOrganization addCategory: #BaselineOfGrease!
+SystemOrganization addCategory: #'BaselineOfGrease-Manifest'!

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`SystemOrganization addCategory: #BaselineOfGrease!`
	`2`	`+SystemOrganization addCategory: #'BaselineOfGrease-Manifest'!`