Merge pull request #253 from SubtitleEdit/github-actions

Update artifact upload workflow
SubtitleEdit · Nov 22, 2024 · 2cfba5b · 2cfba5b
2 parents dccc120 + fa1fb85
commit 2cfba5b
Show file tree

Hide file tree

Showing 5 changed files with 194 additions and 200 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,16 +4,14 @@ on:
   push:
     branches:
       - main
+      - github-actions
   pull_request:
     branches:
       - main
 
 jobs:
-  build:
+  build-job:
     runs-on: windows-latest
-    #    strategy:
-    #      matrix:
-    #        plugin: [ 'NoRecursiveDash', 'HIColorer', 'HI2UC', 'LinesUnbreaker' ]
 
     steps:
       # Checkout the repository
@@ -41,21 +39,40 @@ jobs:
 
       # Build the solution
       - name: Build solution
-        run: msbuild "source\Plugins.Filter.slnf" /p:Configuration=Release /p:SkipSharedProject=true
+        run: msbuild "source\Plugins.Filter.slnf" /p:Configuration=Release
 
+      # Copy dll to target directory
       - name: Create archives
         shell: pwsh
         run: source\zip-plugin-files.ps1
-
-      #      - name: Upload Artifact (All)
-      #        uses: actions/upload-artifact@v4
-      #        with:
-      #          name: Plugins
-      #          path: C:\plugins\*.dll
-    call-upload-artifacts-workflow:
-      - use: ./github/workflows/upload-artifacts.yml
-#      - name: Upload Artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: ${{matrix.plugin}}
-#          path: C:\plugins\${{matrix.plugin}}.dll
+
+      # Upload plugins/artifacts
+      - name: Upload HI2UC
+        uses: actions/upload-artifact@v4
+        with:
+          name: HI2UC
+          path: C:\plugins\HI2UC.dll
+
+      - name: Upload HIColorer
+        uses: actions/upload-artifact@v4
+        with:
+          name: HIColorer
+          path: C:\plugins\HIColorer.dll
+
+      - name: Upload TightHyphen
+        uses: actions/upload-artifact@v4
+        with:
+          name: TightHyphen
+          path: C:\plugins\TightHyphen.dll
+
+      - name: Upload NoRecursiveDash
+        uses: actions/upload-artifact@v4
+        with:
+          name: NoRecursiveDash
+          path: C:\plugins\NoRecursiveDash.dll
+
+      - name: Upload LinesUnbreaker
+        uses: actions/upload-artifact@v4
+        with:
+          name: LinesUnbreaker
+          path: C:\plugins\LinesUnbreaker.dll
diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml
diff --git a/source/DictionariesProvider/Forms/Main.cs b/source/DictionariesProvider/Forms/Main.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using Nikse.SubtitleEdit.PluginLogic.Helpers;
+using Nikse.SubtitleEdit.PluginLogic.Helpers;
 using Nikse.SubtitleEdit.PluginLogic.Models;
 using System;
 using System.Collections.Generic;
@@ -9,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml.Linq;
+using Newtonsoft.Json;
 
 namespace Nikse.SubtitleEdit.PluginLogic.Forms
 {

diff --git a/source/Plugin-Shared/Plugin-Shared.shproj b/source/Plugin-Shared/Plugin-Shared.shproj
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>59aa41aa-6c3e-456f-8ec1-3c0c90e31811</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Plugin-Shared.projitems" Label="Shared" Condition="'$(SkipSharedProject)' != 'true'"/>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+    <PropertyGroup Label="Globals">
+        <ProjectGuid>59aa41aa-6c3e-456f-8ec1-3c0c90e31811</ProjectGuid>
+        <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    </PropertyGroup>
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
+    <Import Project="Plugin-Shared.projitems" Label="Shared"/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
 </Project>