Merge pull request #77 from LionWeb-io/merge2021.3

merge into 2021.3
LionWeb-io · Nov 7, 2023 · 5f45ff3 · 5f45ff3
2 parents 25f4092 + f0aee3d
commit 5f45ff3
Show file tree

Hide file tree

Showing 34 changed files with 7,475 additions and 6,911 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,16 +4,37 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-    name: Java 11 Build
+    name: Java 11 Build and Test
 
     steps:
     - uses: actions/checkout@v1
+
+    - name: Install dependencies
+      run: sudo apt-get install -y x11vnc xvfb
+
     - name: Setup java
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
         java-version: 11
-    - name: Build languages
-      run: ./gradlew assembleMps
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        cache-disabled: false
+
+    - name: Test languages
+      run:  xvfb-run ./gradlew checkMps
+
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      if: always()
+      with:
+        files: |
+          TEST-*.xml
+        large_files: "true"
+        report_individual_runs: "true"
+        report_suite_logs: "any"
+        check_run_annotations: all tests, skipped tests
+        action_fail: "true"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,65 @@
+# gradle-release-plugin.yml
+# from https://wszlosek.github.io/DevDawn/2023/06/28/gradle-release-plugin.html
+
+name: Create release
+
+# Controls when the action will run
+# Option bellow allows you to run the workflow manually
+on:
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: 'Release new version'
+
+# Allow GitHub Actions to push changes to the repository
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: sudo apt-get install -y x11vnc xvfb
+
+      - name: Setup java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      # Setup git config of the GitHub Actions Bot
+      - name: Setup git config
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "<>"
+
+      # Run release task
+      - name: Release with Gradle Release Plugin
+        env:
+          SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          RELEASE_VERSION: ${{ inputs.release_version }}
+        run: xvfb-run ./gradlew release
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: |
+            TEST-*.xml
+          large_files: "true"
+          report_individual_runs: "true"
+          report_suite_logs: "any"
+          check_run_annotations: all tests, skipped tests
+          action_fail: "true"
diff --git a/.mps/modules.xml b/.mps/modules.xml
@@ -26,9 +26,12 @@
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.client.persistence/io.lionweb.mps.client.persistence.msd" folder="client" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.lang.runtime/io.lionweb.mps.converter.lang.runtime.msd" folder="lang.converter" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.disabled/io.lionweb.mps.converter.test.disabled.msd" folder="xx_broken" />
+      <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.mpsextensions/io.lionweb.mps.converter.test.mpsextensions.msd" folder="test" />
+      <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.support/io.lionweb.mps.converter.test.support.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.usebroken/io.lionweb.mps.converter.test.usebroken.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test/io.lionweb.mps.converter.test.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter/io.lionweb.mps.converter.msd" folder="lang.converter" />
+      <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json.test.support/io.lionweb.mps.json.test.support.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json.test/io.lionweb.mps.json.test.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json/io.lionweb.mps.json.msd" folder="lang.json" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.lang.test/io.lionweb.mps.lang.test.msd" folder="test" />