Update tagged_release.yml (#30)

michelu89 · web-flow · commit a7bf3c7b15a4 · 2023-04-12T14:22:28.000+02:00
* Update tagged_release.yml

* Update tagged_release.yml

* Add workaround to migrate from bamm to samm from import
diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/tagged_release.yml
@@ -1,9 +1,11 @@
 name: "Create Tagged Release"
 
 on:
-  push:
-    tags:
-      - "v*"
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: 'Version number of the release'
+        required: true
 
 jobs:
   gh_tagged_release:
@@ -18,6 +20,11 @@ jobs:
       - name: Checkout project
         uses: actions/checkout@v3
 
+      - name: Setup Git
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
       - name: Configure Pagefile
         if: matrix.os == 'windows-latest'
         # Fix for "LINK : fatal error LNK1171: unable to load mspdbcore.dll (error code: 1455)":
@@ -46,19 +53,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Set maven version on Mac
-        if: matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest'
+      - name: Set versions
         run: |
-          tagVersion=${GITHUB_REF/refs\/tags\/v/}
-          mvn versions:set -DnewVersion=$tagVersion
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          release_version=${{ github.event.inputs.release_version }}
+          release_branch_name=${release_version%.*}.x
+          echo "release_branch_name=$release_branch_name" >> $GITHUB_ENV
 
-      - name: Set maven version on Windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          $tagVersion = ${env:GITHUB_REF} -replace 'refs/tags/v',''
-          mvn versions:set -DnewVersion="$tagVersion"
+      - name: Set maven version
+        run: mvn versions:set -DnewVersion=${{ github.event.inputs.release_version }}
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -81,68 +83,86 @@ jobs:
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Create GitHub release (Mac)
-        if: ${{ (matrix.os == 'macos-latest') &&  (!contains( github.ref, '-M' )) }}
-        uses: svenstaro/upload-release-action@latest
+      - name: "Create GitHub release Mac (full)"
+        if: ${{ (matrix.os == 'macos-latest') &&  (!contains( github.ref, '-rc' )) }}
+        uses: softprops/action-gh-release@v1
+        id: esmf_ame_mac_release
         with:
-          file_glob: true
-          overwrite: true
+          body: "Release version ${{ github.event.inputs.release_version }}."
+          tag_name: v${{ github.event.inputs.release_version }}
+          target_commitish: ${{ env.release_branch_name }}
+          draft: false
           prerelease: false
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/ame-backend!(*.txt)-mac
-          tag: ${{ github.ref }}
+          files: target/ame-backend!(*.txt)-mac
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
-      - name: Create GitHub pre-release (Mac)
-        if: ${{ (matrix.os == 'macos-latest') &&  (contains( github.ref, '-M' )) }}
-        uses: svenstaro/upload-release-action@latest
+      - name: "Create GitHub pre-release Mac (full)"
+        if: ${{ (matrix.os == 'macos-latest') &&  (contains( github.ref, '-rc' )) }}
+        uses: softprops/action-gh-release@v1
+        id: esmf_ame_mac_release
         with:
-          file_glob: true
-          overwrite: true
+          body: "Release version ${{ github.event.inputs.release_version }}."
+          tag_name: v${{ github.event.inputs.release_version }}
+          target_commitish: ${{ env.release_branch_name }}
+          draft: false
           prerelease: true
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/ame-backend!(*.txt)-mac
-          tag: ${{ github.ref }}
+          files: target/ame-backend!(*.txt)-mac
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
-      - name: Create GitHub release (Linux)
-        if: ${{ (matrix.os == 'ubuntu-latest') &&  (!contains( github.ref, '-M' )) }}
-        uses: svenstaro/upload-release-action@latest
+      - name: "Create GitHub release Linux (full)"
+        if: ${{ (matrix.os == 'ubuntu-latest') &&  (!contains( github.ref, '-rc' )) }}
+        uses: softprops/action-gh-release@v1
+        id: esmf_ame_linux_release
         with:
-          file_glob: true
-          overwrite: true
+          body: "Release version ${{ github.event.inputs.release_version }}."
+          tag_name: v${{ github.event.inputs.release_version }}
+          target_commitish: ${{ env.release_branch_name }}
+          draft: false
           prerelease: false
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/ame-backend!(*.txt)-linux
-          tag: ${{ github.ref }}
+          files: target/ame-backend!(*.txt)-linux
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
-      - name: Create GitHub pre-release (Linux)
-        if: ${{ (matrix.os == 'ubuntu-latest') &&  (contains( github.ref, '-M' )) }}
-        uses: svenstaro/upload-release-action@latest
+      - name: "Create GitHub pre-release Linux (full)"
+        if: ${{ (matrix.os == 'ubuntu-latest') &&  (contains( github.ref, '-rc' )) }}
+        uses: softprops/action-gh-release@v1
+        id: esmf_ame_linux_release
         with:
-          file_glob: true
-          overwrite: true
+          body: "Release version ${{ github.event.inputs.release_version }}."
+          tag_name: v${{ github.event.inputs.release_version }}
+          target_commitish: ${{ env.release_branch_name }}
+          draft: false
           prerelease: true
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/ame-backend!(*.txt)-linux
-          tag: ${{ github.ref }}
+          files: target/ame-backend!(*.txt)-linux
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
-      - name: Create GitHub release (Windows)
-        if: ${{ (matrix.os == 'windows-latest') && (!contains( github.ref, '-M' )) }}
-        uses: svenstaro/upload-release-action@latest
+      - name: "Create GitHub release Windows (full)"
+        if: ${{ (matrix.os == 'windows-latest') && (!contains( github.ref, '-rc' )) }}
+        uses: softprops/action-gh-release@v1
+        id: esmf_ame_win_release
         with:
-          file_glob: true
-          overwrite: true
+          body: "Release version ${{ github.event.inputs.release_version }}."
+          tag_name: v${{ github.event.inputs.release_version }}
+          target_commitish: ${{ env.release_branch_name }}
+          draft: false
           prerelease: false
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/ame-backend!(*.txt)-win.exe
-          tag: ${{ github.ref }}
+          files: target/ame-backend!(*.txt)-win.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
 
-      - name: Create GitHub pre-release (Windows)
-        if: ${{ (matrix.os == 'windows-latest') && (contains( github.ref, '-M' )) }}
-        uses: svenstaro/upload-release-action@latest
+      - name: "Create GitHub pre-release Windows (full)"
+        if: ${{ (matrix.os == 'windows-latest') && (contains( github.ref, '-rc' )) }}
+        uses: softprops/action-gh-release@v1
+        id: esmf_ame_win_release
         with:
-          file_glob: true
-          overwrite: true
+          body: "Release version ${{ github.event.inputs.release_version }}."
+          tag_name: v${{ github.event.inputs.release_version }}
+          target_commitish: ${{ env.release_branch_name }}
+          draft: false
           prerelease: true
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/ame-backend!(*.txt)-win.exe
-          tag: ${{ github.ref }}
+          files: target/ame-backend!(*.txt)-win.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
diff --git a/src/main/java/org/eclipse/esmf/ame/services/PackageService.java b/src/main/java/org/eclipse/esmf/ame/services/PackageService.java
@@ -157,8 +157,20 @@ private void validateValidFiles( final LocalPackageInfo localPackageInfo, final
          final Boolean modelExist = strategy.checkModelExist( aspectModelFile,
                ValidationProcess.MODELS.getPath().toString() );
 
-         final ViolationReport violationReport = ModelUtils.validateModel( fileInfo.getAspectModel(),
-               aspectModelValidator, validationProcess );
+         String aspectModel = fileInfo.getAspectModel();
+
+         // TODO: remove this workaround when bamm is completely replaced by samm
+         if ( aspectModel.contains( "bamm" ) ) {
+            aspectModel = fileInfo.getAspectModel().replaceAll( "bamm", "samm" )
+                                  .replaceAll( "io.openmanufacturing", "org.eclipse.esmf.samm" );
+
+            strategy.saveModel( Optional.empty(),
+                  ModelUtils.getPrettyPrintedModel( aspectModel, ValidationProcess.IMPORT ),
+                  ValidationProcess.IMPORT.getPath().toString() );
+         }
+
+         final ViolationReport violationReport = ModelUtils.validateModel( aspectModel, aspectModelValidator,
+               validationProcess );
 
          processPackage.addValidFiles( new ValidFile( aspectModelFile, violationReport, modelExist ) );
          getMissingAspectModelFiles( violationReport, aspectModelFile, modelStoragePath ).forEach(
@@ -191,10 +203,9 @@ public List<String> importAspectModelPackage( final List<String> aspectModelFile
 
    private List<MissingElement> getMissingAspectModelFiles( final ViolationReport violationReport,
          final String fileName, final String modelStoragePath ) {
-      final List<ViolationError> violationErrors = violationReport.getViolationErrors().stream()
-                                                                  .filter( violation -> violation.getErrorCode() != null
-                                                                        && violation.getErrorCode().equals(
-                                                                        ProcessingViolation.ERROR_CODE ) )
+      final List<ViolationError> violationErrors = violationReport.getViolationErrors().stream().filter(
+                                                                        violation -> violation.getErrorCode() != null && violation.getErrorCode()
+                                                                                                                                  .equals( ProcessingViolation.ERROR_CODE ) )
                                                                   .toList();
 
       if ( violationErrors.isEmpty() ) {
@@ -204,8 +215,7 @@ private List<MissingElement> getMissingAspectModelFiles( final ViolationReport v
       return violationErrors.stream().map( validation -> {
          final AspectModelUrn focusNode = validation.getFocusNode() != null ? validation.getFocusNode() : null;
 
-         final String missingAspectModelFile = ModelUtils.getAspectModelFile( modelStoragePath,
-               focusNode );
+         final String missingAspectModelFile = ModelUtils.getAspectModelFile( modelStoragePath, focusNode );
 
          final String errorMessage = String.format(
                "Referenced element: '%s' could not be found in Aspect Model file: '%s'.", focusNode, fileName );
