Merge pull request #8 from itemisCREATE/addin-workflow-action

Workflow action to build AddIn and CLI

Author: laszloItemis

.github/workflows/build.yml

@@ -0,0 +1,77 @@
+
+name: build
+run-name: triggered by ${{ github.actor }}
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+ 
+jobs:
+
+  cli-build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: maven
+
+    - name: Build & test with Maven
+      run: |
+        cd CLI
+        mvn -T 2 clean verify -B
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: CLI
+        compression-level: 0 # artifact is already compressed
+        retention-days: 2
+        path: CLI/com.yakindu.bridges.ea.example.cli.product/target/products/*.zip
+
+
+  addin-build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    # Install the .NET Core workload
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v2
+
+    # Execute all unit tests in the solution
+    #- name: Execute unit tests
+    #  run: dotnet test
+
+    # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore the application
+      run: |
+        cd AddIn
+        msbuild /t:restore .\Itemis_Integrate_EA_Example_AddIn.sln /p:Configuration=Release
+
+    # Create the app package by building and packaging the project
+    - name: Create the app package
+      run: |
+        cd AddIn
+        msbuild Itemis_Integrate_EA_Example_AddIn.sln /p:Configuration=Release /p:Platform="Any CPU" /detailedsummary /v:detailed
+
+    # Upload the installer package
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: Installer
+        path: AddIn/Itemis_Integrate_EA_Example_AddIn_Setup/bin/x86/Release/*.msi

AddIn/Itemis_Integrate_EA_Example_AddIn/Itemis_Integrate_EA_Example_AddIn.csproj

@@ -45,8 +45,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Interop.EA">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Sparx Systems\EA\Interop.EA.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>$(MSBuildThisFileDirectory)..\Lib\Interop.EA.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
     <Reference Include="System" />

AddIn/Itemis_Integrate_EA_Example_AddIn/UI/ValidationIssuesControl.cs

@@ -247,7 +247,7 @@ public void NavigateToElementInProjectExplorer(ValidationIssue issue)
                 if (elementDiagrams != null && elementDiagrams.Count >= 1)
                 {
                     // we'll navigate to the first diagram for now
-                    diagram = elementDiagrams.GetAt(0);
+                    diagram = (EA.Diagram)elementDiagrams.GetAt(0);
                     Repository.OpenDiagram(diagram.DiagramID);
                     Repository.ActivateDiagram(diagram.DiagramID);
                 }

AddIn/Itemis_Integrate_EA_Example_AddIn_Setup/Dialog.wxi

@@ -35,6 +35,8 @@
 		<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
 		<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
 		<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
+		<Publish Dialog="BrowseDlg" Control="OK" Event="EndDialog" Value="Return" />
+		
 	</UI>
 
 	<UIRef Id="WixUI_Common" />

AddIn/Itemis_Integrate_EA_Example_AddIn_Setup/Product.wxs

@@ -11,7 +11,7 @@
 		<!-- Upgrade: Remove previous installer -->
 		<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
 		<Upgrade Id="A3AEAA62-10B3-482A-BB69-BE186C4BAE59">
-			<UpgradeVersion Minimum="1.0.0.0" Maximum="99.0.0.0" Property="PREVIOUSVERSIONSINSTALLED" IncludeMinimum="yes" IncludeMaximum="no" />
+			<UpgradeVersion Minimum="0.0.0.0" Maximum="1.0.0.0" Property="PREVIOUSVERSIONSINSTALLED" IncludeMinimum="yes" IncludeMaximum="no" />
 		</Upgrade>
 
 		<!-- Custom actions, see https://www.firegiant.com/wix/tutorial/events-and-actions/at-a-later-stage/) -->

AddIn/Itemis_Integrate_EA_Example_AddIn_Tests/Itemis_Integrate_EA_Example_AddIn_Tests.csproj

@@ -26,9 +26,8 @@
 
 	<ItemGroup>
 		<Reference Include="Interop.EA">
-			<HintPath>C:\Program Files (x86)\Sparx Systems\EA\Interop.EA.dll</HintPath>
-			<EmbedInteropTypes>True</EmbedInteropTypes>
-			<Private>True</Private>
+			<HintPath>$(MSBuildThisFileDirectory)..\Lib\Interop.EA.dll</HintPath>
+			<EmbedInteropTypes>False</EmbedInteropTypes>
 		</Reference>
 	</ItemGroup>
 

AddIn/Lib/Interop.EA.dll

@@ -1,7 +1,7 @@
 <extensions>
 	<extension>
-		<groupId>org.eclipse.tycho.extras</groupId>
-		<artifactId>tycho-pomless</artifactId>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
 		<version>4.0.13</version>
 	</extension>
 </extensions>

CLI/.mvn/extensions.xml

@@ -64,7 +64,7 @@ private List<String> assertIssuesInModel(String elementToValidate, String... exp
 
 		// then
 		for (String segment : List.of(">> Loading '", ">> Collecting UML Elements DONE.", ">> Validating DONE.",
-				"Validation successfully finished.")) {
+				"CLI successfully finished.")) {
 			assertTrue("Missing in console output: \"" + segment + "\"\n\n" + output, output.contains(segment));
 		}
 

CLI/com.yakindu.bridges.ea.example.cli.test/src/com/yakindu/bridges/ea/example/cli/test/ExampleCLITest.java

@@ -95,12 +95,20 @@ private Resource load(String filePath) throws Exception {
 			loadOptions.put(EAResource.OPTION_READONLY, true);
 			loadOptions.put(EAResource.OPTION_REPORT_TO_ERROR_LOG, false);
 			loadOptions.put(EAResource.OPTION_REPORT_AS_RESOURCE_MARKERS, false);
+			checkLInfo();
 		}
 		final Resource res = set.getResource(uri, true);
 		UMLModelUtils.adjustTimeEventsInModel(res);
 		return res;
 	}
 
+	private void checkLInfo() throws Exception {
+		@SuppressWarnings("restriction")
+		final String msg = com.yakindu.bridges.ea.core.internal.utils.LInfo.isV();
+		if (msg != null)
+			throw new Exception(msg);
+	}
+
 	protected String getNameOrGuidFromArguments(String[] args) {
 		for (String arg : args) {
 			if (!ExampleCLI.VERBOSE_OUTPUT.equals(arg)) {