Merge branch 'dev' into InlineRewrite

.github/workflows/currentAll.yml → .github/workflows/tests-all.yml

@@ -6,9 +6,9 @@ env:
 
 on:
   push:
-    branches: [ integration ]
+    branches: [ Pharo12 ]
   pull_request:
-    branches: [ integration ]
+    branches: [ Pharo12 ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -19,11 +19,11 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        smalltalk: [ Pharo64-10 ]
+        smalltalk: [ Pharo64-12 ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup smalltalkCI
         uses: hpi-swa/setup-smalltalkCI@v1
         with:

.github/workflows/currentMaster.yml → .github/workflows/tests.yml

@@ -1,14 +1,16 @@
-name: currentMaster
+name: MicroDown tests
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 on:
   push:
     branches:
+      - dev
       - master
   pull_request:
     branches:
+      - dev
       - master
   workflow_dispatch:
 
@@ -19,11 +21,11 @@ jobs:
         platform: [ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: hpi-swa/setup-smalltalkCI@v1
         id: smalltalkci
         with:
-          smalltalk-image: Pharo64-10
+          smalltalk-image: Pharo64-12
       - run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }}
         shell: bash
         timeout-minutes: 15

.project

@@ -1,3 +1,4 @@
 {
-	'srcDirectory' : 'src'
-}
+	'srcDirectory' : 'src',
+	'tags' : [ #system ]
+}

.smalltalk.All.ston

@@ -27,6 +27,8 @@ SmalltalkCISpec {
   			#OutOfMemoryTest,
   			#TraitFileOutTest,
   			#PlatformResolverTest,
+  			#SystemDependenciesTest,
+  			#DAMessageSendAnalyzerTest,
   			#ProcessSpecificTest
   		] 
   	}

.smalltalk.Release.ston

@@ -3,6 +3,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Microdown',
+      #load : [ 'RichText', 'Tests' ],
       #onConflict : #useIncoming,
       #onUpgrade : #useIncoming,
       #ignoreImage : true,

README.md

@@ -1,10 +1,6 @@
 # Microdown Parser and Elements
 
-I'm a parser for microdown implemented by S. Ducasse, L. Dargaud and G. Polito. The implementation is based on the work on markdown of K. Osterbye. 
-Microdown is a smaller markdown but it is more extensible.  
-
-[![Microdown-Pharo-Integration](https://github.com/pillar-markup/Microdown/actions/workflows/currentAll.yml/badge.svg)](https://github.com/pillar-markup/Microdown/actions/workflows/currentAll.yml)  
-[![currentDev](https://github.com/pillar-markup/Microdown/actions/workflows/currentDev.yml/badge.svg)](https://github.com/pillar-markup/Microdown/actions/workflows/currentDev.yml)  
+I'm a parser for microdown implemented by S. Ducasse, L. Dargaud and G. Polito. The implementation is based on the work on markdown of K. Osterbye. Microdown is a smaller markdown but it is more extensible.   
 
 ## Quick start
 ### Loading specific version
@@ -145,4 +141,3 @@ The other packages in this repository are the extensions made to produce Pillar
 Such packages should be moved in the future to other location (probably pillar itself).
 
 
-

src/BaselineOfMicrodown/BaselineOfMicrodown.class.st

@@ -32,15 +32,15 @@ BaselineOfMicrodown >> baseline: spec [
 			package: #'Microdown-MathFlaky-Tests'
 				with: [ spec requires: #( #'Microdown-RichTextComposer-Tests' ) ];
 
-			package: #'Microdown-RichTextPresenter'
+			"package: #'Microdown-RichTextPresenter'
 				with: [ spec requires: #( #Microdown ) ];
 			package: #'Microdown-RichTextPresenter-Tests'
 				with: [ spec requires: #( #'Microdown-RichTextPresenter' ) ];
 				
 			package: #'Microdown-DocumentBrowser'
 				with: [ spec requires: #( #Microdown #'Microdown-RichTextPresenter') ];
 			package: #'Microdown-DocumentBrowser-Tests'
-				with: [ spec requires: #( #'Microdown-DocumentBrowser' ) ];
+				with: [ spec requires: #( #'Microdown-DocumentBrowser' ) ];"
 
 			package: #'Microdown-Transformer'
 				with: [ spec requires: #( #Microdown ) ];
@@ -80,10 +80,12 @@ BaselineOfMicrodown >> baseline: spec [
 			group: 'Tests' with: #('Core' 'Microdown-Tests');
 			group: 'RichText' with: #('Core' 'Microdown-RichTextComposer' );
 			group: 'Extensions' with: #(
+				"
 				#'Microdown-RichTextPresenter'
 				#'Microdown-RichTextPresenter-Tests'
 				#'Microdown-DocumentBrowser'
-				#'Microdown-DocumentBrowser-Tests' 
+				#'Microdown-DocumentBrowser-Tests'
+				"
 				#'Microdown-Evaluator'
 				#'Microdown-Evaluator-Tests'
 				#'Microdown-PrettyPrinter'